Merging develop into master

altya · Apr 27, 2019 · 35e9d83 · 35e9d83
2 parents 9bf90ce + 217e83a
commit 35e9d83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,12 +55,12 @@ message(STATUS "PUMI_FORTRAN_INTERFACE: ${PUMI_FORTRAN_INTERFACE}")
 
 get_filename_component(COMPILER_DIR "${CMAKE_CXX_COMPILER}" PATH)
 find_program(MPIRUN NAMES mpirun PATHS "${COMPILER_DIR}")
-set(MPIRUN_PROCFLAG "-np" CACHE string
+set(MPIRUN_PROCFLAG "-np" CACHE STRING
   "the command line flag to give process count to MPIRUN")
 message(STATUS "MPIRUN: ${MPIRUN} ${MPIRUN_PROCFLAG}")
-set(VALGRIND "" CACHE string
+set(VALGRIND "" CACHE STRING
   "the valgrind executable")
-set(VALGRIND_ARGS "" CACHE string
+set(VALGRIND_ARGS "" CACHE STRING
   "the command line arguments to VALGRIND")
 
 # smoke test target - a few tests are defined later with the 'SMOKE_TEST' label

diff --git a/phasta/phInput.cc b/phasta/phInput.cc
@@ -82,11 +82,11 @@ static void setDefaults(Input& in)
   in.gammaSize = 3e-5;
   in.nRigidBody = 0;
   in.nRBParam = 12;
-  in.gradingFactor = 1.25;
+  in.gradingFactor = 2.0;
   in.simCooperation = 1;
-  in.simAdaptDesiredErrorMass = 1.0;
-  in.simAdaptDesiredErrorMomt = 1.0;
-  in.simAdaptDesiredErrorEnrg = 1.0;
+  in.simAdaptDesiredErrorMass = 1.0e16;
+  in.simAdaptDesiredErrorMomt = 1.0e16;
+  in.simAdaptDesiredErrorEnrg = 1.0e16;
   in.writeSimLog = 0;
 }