Skip to content

Commit 2597f1a

Browse files
committed
Merge branch 'brhillman/fixes-for-sandiatoss3' into master (PR #7377)
Fixes for Sandia machines Fixes for Sandia machines (flight, boca, sandiatoss3): * Change nscratch to tscratch since nscratch is being phased out and mounted read-only * Load specific python version to avoid both minimum version error and also distutils deprecation * Share module environment between ghost and flight/boca, since ghost configuration seemed to be broken [BFB]
2 parents d73a816 + ac94f32 commit 2597f1a

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

cime_config/machines/config_machines.xml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,7 +2273,7 @@
22732273
<command name="load">sems-archive-netcdf/4.4.1/exo</command>
22742274
</modules>
22752275
</module_system>
2276-
<RUNDIR>/nscratch/$USER/acme_scratch/sandiatoss3/$CASE/run</RUNDIR>
2276+
<RUNDIR>/tscratch/$USER/acme_scratch/sandiatoss3/$CASE/run</RUNDIR>
22772277
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
22782278
<!-- complete path to a short term archiving directory -->
22792279
<!-- path to the cprnc tool used to compare netcdf history files in testing -->
@@ -2334,6 +2334,7 @@
23342334
<command name="purge"/>
23352335
<command name="use">/projects/sems/acme-boca-modulefiles/env-module</command>
23362336
<command name="load">acme-boca-env</command>
2337+
<command name="load">aue/python/3.11.6</command>
23372338
<command name="load">sems-archive-git</command>
23382339
<command name="load">sems-archive-cmake/3.19.1</command>
23392340
<command name="load">gnu/10.2</command>
@@ -2347,7 +2348,7 @@
23472348
<command name="load">sems-archive-netcdf/4.4.1/exo</command>
23482349
</modules>
23492350
</module_system>
2350-
<RUNDIR>/nscratch/$USER/acme_scratch/boca/$CASE/run</RUNDIR>
2351+
<RUNDIR>/tscratch/$USER/acme_scratch/boca/$CASE/run</RUNDIR>
23512352
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
23522353
<!-- complete path to a short term archiving directory -->
23532354
<!-- path to the cprnc tool used to compare netcdf history files in testing -->
@@ -2415,6 +2416,7 @@
24152416
<command name="purge"/>
24162417
<command name="use">/projects/sems/acme-boca-modulefiles/env-module</command>
24172418
<command name="load">acme-boca-env</command>
2419+
<command name="load">aue/python/3.11.6</command>
24182420
<command name="load">sems-archive-git</command>
24192421
<command name="load">sems-archive-cmake/3.19.1</command>
24202422
<command name="load">gnu/10.3.1</command>
@@ -2428,7 +2430,7 @@
24282430
<command name="load">sems-archive-netcdf/4.4.1/exo</command>
24292431
</modules>
24302432
</module_system>
2431-
<RUNDIR>/nscratch/$USER/acme_scratch/flight/$CASE/run</RUNDIR>
2433+
<RUNDIR>/tscratch/$USER/acme_scratch/flight/$CASE/run</RUNDIR>
24322434
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
24332435
<!-- complete path to a short term archiving directory -->
24342436
<!-- path to the cprnc tool used to compare netcdf history files in testing -->
@@ -2459,7 +2461,7 @@
24592461
<MPILIBS>openmpi</MPILIBS>
24602462
<PROJECT>fy210162</PROJECT>
24612463

2462-
<CIME_OUTPUT_ROOT>/gscratch/$USER/acme_scratch/ghost</CIME_OUTPUT_ROOT>
2464+
<CIME_OUTPUT_ROOT>/tscratch/$USER/acme_scratch/ghost</CIME_OUTPUT_ROOT>
24632465
<DIN_LOC_ROOT>/projects/ccsm/inputdata</DIN_LOC_ROOT>
24642466
<DIN_LOC_ROOT_CLMFORC>/projects/ccsm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
24652467
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
@@ -2493,17 +2495,20 @@
24932495
<cmd_path lang="sh">module</cmd_path>
24942496
<modules>
24952497
<command name="purge"/>
2496-
<command name="load">sems-env</command>
2497-
<command name="load">sems-git</command>
2498-
<command name="load">sems-python/3.5.2</command>
2499-
<command name="load">sems-cmake</command>
2500-
<command name="load">gnu/4.9.2</command>
2501-
<command name="load">sems-intel/16.0.2</command>
2502-
<command name="load">mkl/16.0</command>
2503-
<command name="load">sems-netcdf/4.4.1/exo_parallel</command>
2498+
<command name="use">/projects/sems/acme-boca-modulefiles/env-module</command>
2499+
<command name="load">acme-boca-env</command>
2500+
<command name="load">aue/python/3.11.6</command>
2501+
<command name="load">sems-archive-git</command>
2502+
<command name="load">sems-archive-cmake/3.19.1</command>
2503+
<command name="load">gnu/10.3.1</command>
2504+
<command name="load">sems-archive-intel/21.3.0</command>
25042505
</modules>
25052506
<modules mpilib="!mpi-serial">
2506-
<command name="load">sems-openmpi/1.10.5</command>
2507+
<command name="load">sems-archive-openmpi/4.1.4</command>
2508+
<command name="load">acme-netcdf/4.7.4/acme</command>
2509+
</modules>
2510+
<modules mpilib="mpi-serial">
2511+
<command name="load">sems-archive-netcdf/4.4.1/exo</command>
25072512
</modules>
25082513
</module_system>
25092514
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>

0 commit comments

Comments
 (0)