Merge pull request #28 from solidsuccs/development

Development Former-commit-id: 5ba788e
solidsgroup · Dec 2, 2019 · df941be · df941be
2 parents 10e4aa9 + e0683ff
commit df941be
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 1,107 deletions.
diff --git a/configure b/configure
@@ -54,7 +54,7 @@ parser.add_argument('--dim', default=3, type=int, help='Spatial dimension [3]')
 parser.add_argument('--comp', default="g++", help='Compiler. Options: [g++], clang++, icc')
 parser.add_argument('--amrex', default="", help='Path to AMReX installation []')
 parser.add_argument('--build-amrex', dest="buildamrex",action='store_true',default=False, help='Download and build AMReX automatically')
-parser.add_argument('--build-amrex-branch',dest="buildamrexbranch",default="19.11", help='AMReX Branch (You probably don\'t need to change this!' )
+parser.add_argument('--build-amrex-branch',dest="buildamrexbranch",default="19.12", help='AMReX Branch (You probably don\'t need to change this!' )
 parser.add_argument('--eigen', default="", help='Path to Eigen installation []')
 parser.add_argument('--get-eigen', dest="geteigen",action='store_true',default=False, help='Download Eigen automatically')
 parser.add_argument('--debug', dest='debug', action='store_true', help='Compile in debug mode')

diff --git a/src/Integrator/StressRelaxation.H b/src/Integrator/StressRelaxation.H