Merge pull request #145 from wenqing/frontend

Updates for frontend2
ufz · Jul 1, 2019 · 0d7306c · 0d7306c
2 parents 8d4cea9 + 7297bbb
commit 0d7306c
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 34 deletions.
diff --git a/FEM/matrix_routines.cpp b/FEM/matrix_routines.cpp
@@ -1,6 +1,6 @@
 /**
  * \copyright
- * Copyright (c) 2018, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
@@ -3162,6 +3162,7 @@ void M1Vorkond(int aufgabe, double* x, double* b)
                         diag -= dim + 1;
                     } /* i */
                 }     /* Modus iLDU, (zerlegen und) aufloesen */
+            // fall through
         case 3:       /* Linkstransformation des Gesamtsystems x <= L(t)*b */
             if
                 VK_Modus(VK_iLDU)
@@ -3347,7 +3348,7 @@ void M34Vorkond(int aufgabe, double* x, double* b)
             u = 0;
             o = w->usym;
             /* kein break! "Fall through" nach Aufgabe 2 */
-
+            // fall through
         case 2:                    /* Linkstransformation  x <= L*b */
             if (VK_Modus(VK_iLDU)) /* incomplete L(D)U-Zerlegung */
             {

diff --git a/FEM/rf_mfp_new.cpp b/FEM/rf_mfp_new.cpp
@@ -1181,7 +1181,7 @@ double CFluidProperties::Density(double* variables)
                 break;
             case 14:  // #Exponential law#
                 density = rho_0 * exp(drho_dp * (max(variables[0], 0.0) - p_0) +
-                                      drho_dT * (max(variables[2], 0.0)) +
+                                      drho_dT * (max(variables[1], 0.0)) +
                                       drho_dC * max(variables[2], 0.0));
                 break;
 
@@ -1378,7 +1378,7 @@ double CFluidProperties::Density(double* variables)
 
             case 14:  // #Exponential law#
                 density = rho_0 * exp(drho_dp * (max(variables[0], 0.0) - p_0) +
-                                      drho_dT * (max(variables[2], 0.0)) +
+                                      drho_dT * (max(variables[1], 0.0)) +
                                       drho_dC * max(variables[2], 0.0));
                 break;
             case 15:  // mixture 1/rho= sum_i x_i/rho_i #p, T, x:-> Amagat's

diff --git a/FEM/rf_random_walk.cpp b/FEM/rf_random_walk.cpp
@@ -6694,8 +6694,11 @@ void DATWriteParticleVTPFile(int current_time_step)
 
     for (int i = 0; i <= current_time_step; ++i)
     {
-        sprintf(c_dummy, "%i", i);
-        istr = c_dummy;
+        //sprintf(c_dummy, "%i", i);
+        std::ostringstream ss;
+        ss << i;
+        istr = ss.str();
+
         for (std::size_t t = 0; t < time_vector.size(); ++t)
         {
             m_tim = time_vector[t];

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -112,7 +112,6 @@ pipeline {
                     steps {
                         script { ogs5BuildLinux {
                             config="MKL"
-                            cmakeOptions="-DMKL_DIR=/opt/intel/mkl"
                         } }
                     }
                     post {

diff --git a/ThirdParty/IPQC/src/phreeqcpp/utilities.cpp b/ThirdParty/IPQC/src/phreeqcpp/utilities.cpp
@@ -874,7 +874,7 @@ parse_couple(char *token)
 	paren_count = 1;
 	paren1[0] = '(';
 	p1 = 1;
-	while (ptr != '\0')
+	while (*ptr != '\0')
 	{
 		ptr++;
 		if (*ptr == '/' || *ptr == '\0')

diff --git a/ThirdParty/PQC/utilities.c b/ThirdParty/PQC/utilities.c
@@ -592,7 +592,7 @@ parse_couple (char *token)
   paren_count = 1;
   paren1[0] = '(';
   p1 = 1;
-  while (ptr != '\0')
+  while (*ptr != '\0')
   {
     ptr++;
     if (*ptr == '/' || *ptr == '\0')

diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
@@ -56,7 +56,7 @@ endif()
 
 find_path(OGS_LIBS_DIR_FOUND .dummy PATHS
     ${CMAKE_SOURCE_DIR}/../Libs
-    /opt/ogs/ogs5-libs
+    /data/ogs/ogs5-libs
     NO_DEFAULT_PATH)
 if(OGS_LIBS_DIR_FOUND)
 	# Find precompiled libraries (for BRNS GEMS LIS)

diff --git a/scripts/cmake/benchmarks/AKS.cmake b/scripts/cmake/benchmarks/AKS.cmake
@@ -88,12 +88,12 @@ Benchmark(AUTHOR AKS
 	RUNTIME 70
 )
 
-Benchmark(AUTHOR AKS
-	PATH GAS_FLOW/Gravity/Gravity
-	CONFIG FEM
-	OUTPUT_FILES Gravity_ply_OUT_t0_MULTI_COMPONENTIAL_FLOW.tec
-	RUNTIME 2
-)
+#Benchmark(AUTHOR AKS
+#	PATH GAS_FLOW/Gravity/Gravity
+#	CONFIG FEM
+#	OUTPUT_FILES Gravity_ply_OUT_t0_MULTI_COMPONENTIAL_FLOW.tec
+#	RUNTIME 2
+#)
 
 Benchmark(AUTHOR AKS
 	PATH GAS_FLOW/gas_flow/h_gas_line

diff --git a/scripts/cmake/benchmarks/CHP.cmake b/scripts/cmake/benchmarks/CHP.cmake
@@ -91,9 +91,9 @@ Benchmark(AUTHOR CHP
 	OUTPUT_FILES h2_line0080.vtk
 )
 
-Benchmark(AUTHOR CHP
-	PATH MULTIPHASE/McWhorterProblem/h2_line
-	CONFIG MKL
-	RUNTIME 1540
-	OUTPUT_FILES h2_line_165.vtu
-)
+#Benchmark(AUTHOR CHP
+#	PATH MULTIPHASE/McWhorterProblem/h2_line
+#	CONFIG MKL
+#	RUNTIME 1540
+#	OUTPUT_FILES h2_line_165.vtu
+#)
diff --git a/scripts/cmake/benchmarks/NB.cmake b/scripts/cmake/benchmarks/NB.cmake
@@ -60,11 +60,11 @@ Benchmark(AUTHOR NB
 	RUNTIME 2
 	OUTPUT_FILES Lauwerier_ply_FRACTURE_t1.tec)
 
-Benchmark(AUTHOR NB
-	PATH FLUID_PROPERTIES/H2T_McWhorter_PwSnw/h2t_line
-	CONFIG MKL
-	RUNTIME 1
-	OUTPUT_FILES h2t_line_domain_line.tec)
+#Benchmark(AUTHOR NB
+#	PATH FLUID_PROPERTIES/H2T_McWhorter_PwSnw/h2t_line
+#	CONFIG MKL
+#	RUNTIME 1
+#	OUTPUT_FILES h2t_line_domain_line.tec)
 
 Benchmark(AUTHOR NB
 	PATH M/pressure/Tube/m_tube_elastic

diff --git a/scripts/cmake/benchmarks/WW.cmake b/scripts/cmake/benchmarks/WW.cmake
@@ -242,11 +242,11 @@ Benchmark(AUTHOR WW
 )
 
 Benchmark(AUTHOR WW
-	PATH MPI/hm_tri/hm_tri
+	PATH MPI/HM/hm
 	CONFIG MPI
 	NUM_PROCESSORS 2
 	RUNTIME 190
-	OUTPUT_FILES hm_tri_domain_tri_0.tec
+	OUTPUT_FILES hm_domain_quad_0.tec
 )
 
 Benchmark(AUTHOR WW

diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh
@@ -1,18 +1,17 @@
 module use /global/apps/modulefiles
 
+module load foss/2018b
+module load petsc-bilke/3.11.0-foss2018b
+
 module load cmake
-module load gcc/6.2.0-1
-module load openmpi/gcc/1.8.8-1
-module load ninja/1.8.2
+module load ninja/1.9.0
 
 # Libraries
 module load boost/1.55.0-4
 module load doxygen/1.8.7-1_gcc_4.8.1
 module load lapack/gcc/3.7.0-1
-module load petsc/3.7.6_maint_gcc6.2.0_openmpi_gcc_1.8.8-1
 
 # Tools
-module load openmpi/gcc/1.8.8-1
 module load numdiff/5.9_gcc_6.2.0_1
 #module rm gmp/5.1.2-1
 module load gmp-shared/6.1.2-1
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,6 @@ pipeline { @@
                         steps {
                             script { ogs5BuildLinux {
                                 config="MKL"
-                                cmakeOptions="-DMKL_DIR=/opt/intel/mkl"
                             } }
                         }
                         post {
@@ Expand Down @@