Skip to content

Commit 2999625

Browse files
authored
Merge branch E3SM-Project/ndk/machinefiles/ndkmf-nersc-adjust-MOAB_ROOT (PR #8499)
For NERSC machines, adjust MOAB_ROOT for nvidia compilers
2 parents d953321 + 30f0f40 commit 2999625

1 file changed

Lines changed: 24 additions & 3 deletions

File tree

cime_config/machines/config_machines.xml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,10 @@
346346
<environment_variables compiler="gnu">
347347
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
348348
</environment_variables>
349-
<environment_variables compiler="nvidia">
349+
<environment_variables compiler="nvidia" DEBUG="TRUE">
350+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
351+
</environment_variables>
352+
<environment_variables compiler="nvidia" DEBUG="FALSE">
350353
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
351354
</environment_variables>
352355
<resource_limits>
@@ -756,12 +759,21 @@
756759
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/aocc-4.1.0; else echo "$SZ_ROOT"; fi}</env>
757760
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/aocc-4.1.0; else echo "$ZFP_ROOT"; fi}</env>
758761
</environment_variables>
759-
<environment_variables compiler="intel">
762+
<environment_variables compiler="intel" DEBUG="TRUE">
763+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel-debug; else echo "$MOAB_ROOT"; fi}</env>
764+
</environment_variables>
765+
<environment_variables compiler="intel" DEBUG="FALSE">
760766
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel; else echo "$MOAB_ROOT"; fi}</env>
761767
</environment_variables>
762768
<environment_variables compiler="gnu">
763769
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
764770
</environment_variables>
771+
<environment_variables compiler="nvidia" DEBUG="TRUE">
772+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
773+
</environment_variables>
774+
<environment_variables compiler="nvidia" DEBUG="FALSE">
775+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
776+
</environment_variables>
765777
<resource_limits>
766778
<resource name="RLIMIT_STACK">-1</resource>
767779
</resource_limits>
@@ -1166,12 +1178,21 @@
11661178
<env name="SZ_ROOT">$SHELL{if [ -z "$SZ_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/sz/2.1.12.5/aocc-4.1.0; else echo "$SZ_ROOT"; fi}</env>
11671179
<env name="ZFP_ROOT">$SHELL{if [ -z "$ZFP_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/zfp/1.0.1/aocc-4.1.0; else echo "$ZFP_ROOT"; fi}</env>
11681180
</environment_variables>
1169-
<environment_variables compiler="intel">
1181+
<environment_variables compiler="intel" DEBUG="TRUE">
1182+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel-debug; else echo "$MOAB_ROOT"; fi}</env>
1183+
</environment_variables>
1184+
<environment_variables compiler="intel" DEBUG="FALSE">
11701185
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/intel; else echo "$MOAB_ROOT"; fi}</env>
11711186
</environment_variables>
11721187
<environment_variables compiler="gnu">
11731188
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/gnu; else echo "$MOAB_ROOT"; fi}</env>
11741189
</environment_variables>
1190+
<environment_variables compiler="nvidia" DEBUG="TRUE">
1191+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia-debug; else echo "$MOAB_ROOT"; fi}</env>
1192+
</environment_variables>
1193+
<environment_variables compiler="nvidia" DEBUG="FALSE">
1194+
<env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /global/cfs/cdirs/e3sm/software/moab/nvidia; else echo "$MOAB_ROOT"; fi}</env>
1195+
</environment_variables>
11751196
<resource_limits>
11761197
<resource name="RLIMIT_STACK">-1</resource>
11771198
</resource_limits>

0 commit comments

Comments
 (0)