Skip to content

Commit

Permalink
Merge branch 'aarondonahue/cime/apr19_lc_updates' (PR #2851)
Browse files Browse the repository at this point in the history
Changes the config files in CIME to reflect recent changes in Livermore
Computing resources:

Update syrah and quartz machine config entries to explicitly load
mvapich2/2.2 which is the only mvapich version on LC that grants
access to pnetcdf/1.9.0.

These changes reflect a change in the default module loads on LC
machines.

In addition, there is a change to the run_script to purge all mention
of the machines cab and sierra (which have been taken down) and to
add a warning message to the build section warning of the sensitivity
of CIME to double slashes (//) in the case directory path.

[BFB] - Bit-For-Bit
  • Loading branch information
AaronDonahue committed Apr 24, 2019
2 parents 8b4e6cc + 07e6362 commit 758f98f
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions config/e3sm/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1404,8 +1404,10 @@
<modules compiler="intel">
<command name="load">python</command>
<command name="load">git</command>
<command name="load">intel</command>
<command name="load">mvapich2</command>
<command name="load">intel/18.0.1</command>
<command name="unload">pnetcdf/1.9.0</command>
<command name="unload">mvapich2</command>
<command name="load">mvapich2/2.2</command>
<command name="load">netcdf-fortran/4.4.4</command>
<command name="load">pnetcdf/1.9.0</command>
</modules>
Expand All @@ -1414,6 +1416,7 @@
<EXEROOT>/p/lscratchh/$CCSMUSER/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.4.4-intel-18.0.1/</env>
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.4.4-intel-18.0.1/</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="!mpi-serial">
<env name="PNETCDFROOT">/usr/tce/packages/pnetcdf/pnetcdf-1.9.0-intel-18.0.1-mvapich2-2.2/</env>
Expand Down Expand Up @@ -1454,8 +1457,10 @@
<modules compiler="intel">
<command name="load">python</command>
<command name="load">git</command>
<command name="load">intel</command>
<command name="load">mvapich2</command>
<command name="load">intel/18.0.1</command>
<command name="unload">pnetcdf/1.9.0</command>
<command name="unload">mvapich2</command>
<command name="load">mvapich2/2.2</command>
<command name="load">netcdf-fortran/4.4.4</command>
<command name="load">pnetcdf/1.9.0</command>
</modules>
Expand All @@ -1464,6 +1469,7 @@
<EXEROOT>/p/lscratchh/$CCSMUSER/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDFROOT">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.4.4-intel-18.0.1/</env>
<env name="NETCDF_PATH">/usr/tce/packages/netcdf-fortran/netcdf-fortran-4.4.4-intel-18.0.1/</env>
</environment_variables>
<environment_variables compiler="intel" mpilib="!mpi-serial">
<env name="PNETCDFROOT">/usr/tce/packages/pnetcdf/pnetcdf-1.9.0-intel-18.0.1-mvapich2-2.2/</env>
Expand Down

0 comments on commit 758f98f

Please sign in to comment.