-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from aurora-multiphysics/sapphire
Sapphire Rapids and other build updates
- Loading branch information
Showing
13 changed files
with
105 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/modules/navier_stokes/include/base/NSFVBase.h b/modules/navier_stokes/include/base/NSFVBase.h | ||
index e90b4a85..7a9ac856 100644 | ||
--- a/modules/navier_stokes/include/base/NSFVBase.h | ||
+++ b/modules/navier_stokes/include/base/NSFVBase.h | ||
@@ -3537,12 +3537,13 @@ NSFVBase<BaseType>::checkBlockwiseConsistency(const std::string block_param_name | ||
"Block '" + block + | ||
"' is not present in the block restriction of the fluid flow action!"); | ||
|
||
- for (const auto & param_name : parameter_names) | ||
+ for (unsigned int param_i = 0; param_i < parameter_names.size(); ++param_i) | ||
{ | ||
- const std::vector<T> & param_vector = parameters().template get<std::vector<T>>(param_name); | ||
+ const std::vector<T> & param_vector = | ||
+ parameters().template get<std::vector<T>>(parameter_names[param_i]); | ||
if (block_names.size() != param_vector.size()) | ||
- paramError(param_name, | ||
- "The number of entries in '" + param_name + "' (" + | ||
+ paramError(parameter_names[param_i], | ||
+ "The number of entries in '" + parameter_names[param_i] + "' (" + | ||
std::to_string(param_vector.size()) + | ||
") is not the same as the number of blocks" | ||
" (" + |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/bin/bash | ||
|
||
# This scripts installs python pre-requisites for Proteus on CSD3. | ||
# It should be run once before the install script. | ||
|
||
module load python/3.11.0-icl | ||
pip3.11 install --user --upgrade packaging | ||
pip3.11 install --user --upgrade pyyaml |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/bash | ||
#SBATCH -J MOOSE | ||
#SBATCH -A <project> | ||
#SBATCH -p cclake | ||
#SBATCH --nodes=2 | ||
#! 56 cores per node 3420 MiB per core | ||
#SBATCH --ntasks=112 | ||
#SBATCH --time=36:00:00 | ||
#SBATCH --mail-type=NONE | ||
|
||
cd $SLURM_SUBMIT_DIR | ||
|
||
echo -e "Changed directory to `pwd`.\n" | ||
echo -e "JobID: $SLURM_JOB_ID\n======" | ||
echo "Time: `date`" | ||
echo "Running on master node: `hostname`" | ||
echo "Current directory: `pwd`" | ||
|
||
source ~/.proteus_profile | ||
mpirun -np 112 proteus-opt --distributed-mesh -t -r 1 -i ~/proteus/examples/benchmark/diffusion_3D_32.i &> log.benchmark |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/bash | ||
#SBATCH -J MOOSE | ||
#SBATCH -A <project> | ||
#SBATCH -p sapphire | ||
#SBATCH --nodes=2 | ||
#! 112 cores per node | ||
#SBATCH --ntasks=224 | ||
#SBATCH --time=36:00:00 | ||
#SBATCH --mail-type=NONE | ||
|
||
cd $SLURM_SUBMIT_DIR | ||
|
||
echo -e "Changed directory to `pwd`.\n" | ||
echo -e "JobID: $SLURM_JOB_ID\n======" | ||
echo "Time: `date`" | ||
echo "Running on master node: `hostname`" | ||
echo "Current directory: `pwd`" | ||
|
||
source ~/.proteus_profile | ||
mpirun -np 224 proteus-opt --distributed-mesh -t -r 1 -i ~/proteus/examples/benchmark/diffusion_3D_32.i &> log.benchmark |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,10 @@ | ||
//* This file is part of the MOOSE framework | ||
//* https://www.mooseframework.org | ||
//* | ||
//* All rights reserved, see COPYRIGHT for full restrictions | ||
//* https://github.com/idaholab/moose/blob/master/COPYRIGHT | ||
//* | ||
//* Licensed under LGPL 2.1, please see LICENSE for details | ||
//* https://www.gnu.org/licenses/lgpl-2.1.html | ||
|
||
#include "ProteusTestApp.h" | ||
#include "MooseInit.h" | ||
#include "Moose.h" | ||
#include "MooseApp.h" | ||
#include "AppFactory.h" | ||
|
||
// Create a performance log | ||
PerfLog Moose::perf_log("Proteus"); | ||
#include "MooseMain.h" | ||
|
||
// Begin the main program. | ||
int | ||
main(int argc, char * argv[]) | ||
{ | ||
// Initialize MPI, solvers and MOOSE | ||
MooseInit init(argc, argv); | ||
|
||
// Register this application's MooseApp and any it depends on | ||
ProteusTestApp::registerApps(); | ||
|
||
// Create an instance of the application and store it in a smart pointer for easy cleanup | ||
std::shared_ptr<MooseApp> app = AppFactory::createAppShared("ProteusTestApp", argc, argv); | ||
|
||
// Execute the application | ||
app->run(); | ||
Moose::main<ProteusTestApp>(argc, argv); | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters