diff --git a/README.md b/README.md index 55e9566..58b326a 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,24 @@ as follows: ./proteus-opt -i .i ``` +Building Using Multiple Cores +----------------------------- + +The install process above can be sped up +by using multiple cores during the build process. +Note that this will also need more memory +and to ensure the build goes smoothly, +we recommend having at least 4GB per core. +Multiple cores are enabled +by setting the MOOSE JOBS environment variable +before running the install script: +``` +export MOOSE_JOBS=4 +``` +Where the number 4 in the example above corresponds to using four cores. + Docker ------ +------ Proteus can be run in a container to make installation easier. diff --git a/examples/fluids/duct3D_ke.i b/examples/fluids/duct3D_ke.i index 68a4b1a..6636195 100644 --- a/examples/fluids/duct3D_ke.i +++ b/examples/fluids/duct3D_ke.i @@ -185,8 +185,9 @@ [Executioner] type = Steady solve_type = NEWTON - petsc_options_iname = '-pc_type -pc_hypre_type' - petsc_options_value = 'hypre euclid' + petsc_options_iname = '-pc_type' + petsc_options_value = 'ilu' + l_max_its = 30 [] [Outputs] diff --git a/examples/fluids/duct3D_laminar_AD.i b/examples/fluids/duct3D_laminar_AD.i index e8b0002..3656393 100644 --- a/examples/fluids/duct3D_laminar_AD.i +++ b/examples/fluids/duct3D_laminar_AD.i @@ -103,8 +103,8 @@ [Executioner] type = Steady solve_type = NEWTON - petsc_options_iname = '-pc_type -pc_hypre_type' - petsc_options_value = 'hypre euclid' + petsc_options_iname = '-pc_type' + petsc_options_value = 'ilu' l_max_its = 30 automatic_scaling = true [] diff --git a/examples/fluids/duct3D_laminar_nonAD.i b/examples/fluids/duct3D_laminar_nonAD.i index 43830c0..1d3aa9a 100644 --- a/examples/fluids/duct3D_laminar_nonAD.i +++ b/examples/fluids/duct3D_laminar_nonAD.i @@ -127,9 +127,10 @@ [Executioner] type = Steady solve_type = NEWTON - petsc_options_iname = '-pc_type -pc_hypre_type' - petsc_options_value = 'hypre euclid' + petsc_options_iname = '-pc_type' + petsc_options_value = 'ilu' l_max_its = 30 + automatic_scaling = true [] [Outputs] diff --git a/scripts/install_csd3.sh b/scripts/install_csd3.sh index 50647a4..3fa214d 100755 --- a/scripts/install_csd3.sh +++ b/scripts/install_csd3.sh @@ -49,6 +49,10 @@ CC=$CC CXX=$CXX F90=$F90 F77=$F77 FC=$FC \ METHODS="opt" ./scripts/update_and_rebuild_libmesh.sh --with-mpi +# Build WASP + +./scripts/update_and_rebuild_wasp.sh + # Configure AD # Derivative size should be the total of # 8 for each first order variable diff --git a/scripts/install_fedora.sh b/scripts/install_fedora.sh index 3029754..92f5bb2 100755 --- a/scripts/install_fedora.sh +++ b/scripts/install_fedora.sh @@ -51,6 +51,10 @@ CC=$CC CXX=$CXX F90=$F90 F77=$F77 FC=$FC \ METHODS="opt" ./scripts/update_and_rebuild_libmesh.sh --with-mpi +# Build WASP + +./scripts/update_and_rebuild_wasp.sh + # Configure AD # Derivative size should be the total of # 8 for each first order variable diff --git a/scripts/install_ubuntu.sh b/scripts/install_ubuntu.sh index 784a018..a353952 100755 --- a/scripts/install_ubuntu.sh +++ b/scripts/install_ubuntu.sh @@ -48,6 +48,10 @@ CC=$CC CXX=$CXX F90=$F90 F77=$F77 FC=$FC \ METHODS="opt" ./scripts/update_and_rebuild_libmesh.sh --with-mpi +# Build WASP + +./scripts/update_and_rebuild_wasp.sh + # Configure AD # Derivative size should be the total of # 8 for each first order variable