Skip to content

Commit

Permalink
Merge pull request #25281 from milljm/25279-reactor-tutorial-pre-built
Browse files Browse the repository at this point in the history
25279 reactor tutorial pre built
  • Loading branch information
milljm authored Aug 24, 2023
2 parents 4b98ccf + 9228751 commit a52b257
Show file tree
Hide file tree
Showing 40 changed files with 442 additions and 7 deletions.
2 changes: 1 addition & 1 deletion conda/moose/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [[ $(uname) == 'Darwin' ]] && [[ $(uname -m) == 'x86_64' ]]; then
fi

# A list of module(s)/directories that we do not want to include for testing
NOT_RUNNABLE=(doc module_load combined geochemistry misc navier_stokes tensor_mechanics framework external_petsc_solver reactor_tutorial)
NOT_RUNNABLE=(doc module_load framework external_petsc_solver)

# Support older bash (like Darwin Intel) to build a list of possible modules we want to test
cd ${CONDA_PREFIX}/moose/share/combined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ In generally, Sawtooth may have a more up-to-date version.
Once loaded, `moose` becomes available. You need now only provide input files to run simulations.
Example input files are also available while this module is loaded.

!template load file=getting_started/installation/workshop_tutorial.md.template MOOSE_SHARE=$MOOSE_DIR/moose/share/moose TUTORIAL=reactor_tutorial
!template load file=getting_started/installation/workshop_tutorial.md.template MOOSE_SHARE=$MOOSE_DIR/moose/share/moose TUTORIAL=heat_conduction

## View Results

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ moose --help
Should produce the help page. This simple command demonstrates that you have sucessfully installed
the MOOSE Conda package.

!template load file=getting_started/installation/workshop_tutorial.md.template MOOSE_SHARE=$CONDA_PREFIX/moose/share/moose TUTORIAL=reactor_tutorial
!template load file=getting_started/installation/workshop_tutorial.md.template MOOSE_SHARE=$CONDA_PREFIX/moose/share/moose TUTORIAL=heat_conduction

## Viewing Results

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,21 @@ mkdir -p ~/projects/examples
cd ~/projects/examples
moose --copy-inputs {{TUTORIAL}}
<output trimmed>
Directory successfully copied into ./combined/{{TUTORIAL}}/
Directory successfully copied into ./moose/{{TUTORIAL}}/
```

!alert! note title=Directory successfully copied into...
Take note of the information being displayed in the output. `moose` is alerting to the directory
structure it created (`the last line`), and sometimes may not represent the exact wordage in the
following instructions.
following instructions. e.g. Linux machines will report "combined", Macintosh machines will report
"moose".
!alert-end!

With the {{TUTORIAL}}'s examples and inputs copied, move into the {{TUTORIAL}} directory and
instruct `moose` to run the tests:

```bash
cd combined/{{TUTORIAL}}
cd ./moose/{{TUTORIAL}}
moose --run -j 6
```

Expand Down
34 changes: 34 additions & 0 deletions modules/geochemistry/test/tests/equilibrium_models/tests
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[Tests]
[./bulk_constraints]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'bulk_constraints.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.508kg
Expand All @@ -26,6 +28,8 @@ NaCl; molality = 0.02402mol/kg(solvent water); free_conc = 1184mg/kg(soln); a
[../]
[./ph_constraint]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'ph_constraint.i'
expect_out = 'H+; bulk_moles = 0.03522mol; bulk_conc = 35.39mg/kg(soln); molality = 1.175e-06mol/kg(solvent water); free_conc = 0.00118mg/kg(soln); act_coeff = 0.8513; log10(a) = -6

Expand All @@ -41,6 +45,8 @@ CaHCO3+; molality = 0.001048mol/kg(solvent water); free_conc = 105.6mg/kg(soln
[../]
[./seawater_no_precip]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'seawater_no_precip.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.036345kg
Expand Down Expand Up @@ -113,6 +119,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = 0.7276767V
[../]
[./seawater_precip]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'seawater_precip.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.036kg
Expand Down Expand Up @@ -158,6 +166,8 @@ CaHCO3+; molality = 2.69e-05mol/kg(solvent water); free_conc = 2.624mg/kg(soln
[../]
[./amazon]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'amazon.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1kg
Expand Down Expand Up @@ -220,6 +230,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = 0.8321V
[../]
[./amazon_with_minerals]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'amazon_with_minerals.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.008kg
Expand Down Expand Up @@ -275,6 +287,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = 0.8321V
[../]
[./red_sea_no_precip]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'red_sea_no_precip.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.345kg
Expand Down Expand Up @@ -359,6 +373,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./red_sea_precip]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'red_sea_precip.i'
expect_out = 'Mass of solvent water = 1kg
Total mass = 1.345kg
Expand Down Expand Up @@ -441,6 +457,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./HCl]
type = 'CSVDiff'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
csvdiff = 'HCl_out.csv'
rel_err = 1.0E-5
Expand All @@ -450,6 +468,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./HCl_no_action]
type = 'CSVDiff'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
csvdiff = 'HCl_out.csv'
prereq = 'HCl'
Expand All @@ -460,6 +480,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except1]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_solvent_kg=false'
Expand All @@ -470,6 +492,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except2]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_pH=false'
Expand All @@ -480,6 +504,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except3]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_molal=false'
Expand All @@ -490,6 +516,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except4]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_mg_per_kg=false'
Expand All @@ -500,6 +528,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except5]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_activity=false'
Expand All @@ -510,6 +540,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except6]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_bulk_moles=false'
Expand All @@ -520,6 +552,8 @@ e- = 0.5*H2O - 1*H+ - 0.25*O2(aq); Eh = -0.1107V
[../]
[./except7]
type = RunException
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'HCl.i'
prereq = 'HCl'
cli_args = 'TimeIndependentReactionSolver/add_aux_temperature=false'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[Tests]
[./console]
type = 'RunApp'
# skip test if test is being run out-of-tree. Issue Ref: #25279
installation_type = in_tree
input = 'console.i'
expect_out = 'Total mass = 1.0005269kg (including kinetic species and free minerals)'
match_literal = true
Expand Down
Loading

0 comments on commit a52b257

Please sign in to comment.