Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates LC machines #6528

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Updates LC machines #6528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d75fb49
Moves to workspace from gdata
jasonb5 Jul 25, 2024
524c69d
Removes quartz and adds dane
jasonb5 Jul 25, 2024
3dd57a0
Renames quartz cmake macros to dane
jasonb5 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .../machines/cmake_macros/intel_quartz.cmake → ...ig/machines/cmake_macros/intel_dane.cmake
View file
Open in desktop
File renamed without changes.
34 changes: 17 additions & 17 deletions cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2996,14 +2996,14 @@
<MPILIBS>mpich</MPILIBS>
<PROJECT>cbronze</PROJECT>
<CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/ruby</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/gdata/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DIN_LOC_ROOT>/usr/workspace/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/workspace/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/p/lustre2/$USER/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/p/lustre2/$USER/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/usr/gdata/e3sm/tools/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/usr/workspace/e3sm/tools/cprnc</CCSM_CPRNC>
<GMAKE_J>8</GMAKE_J>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
<SUPPORTED_BY>boutte3 -at- llnl.gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>56</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>56</MAX_MPITASKS_PER_NODE>
<mpirun mpilib="mpi-serial">
Expand All @@ -3028,7 +3028,7 @@
<command name="load">intel-classic/2021.6.0-magic</command>
<command name="load">mvapich2/2.3.7</command>
<command name="load">cmake/3.19.2</command>
<command name="use --append">/usr/gdata/e3sm/install/quartz/modulefiles</command>
<command name="use --append">/usr/workspace/e3sm/install/quartz/modulefiles</command>
<command name="load">hdf5/1.12.2</command>
<command name="load">netcdf-c/4.9.0</command>
<command name="load">netcdf-fortran/4.6.0</command>
Expand All @@ -3040,28 +3040,28 @@
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDF_PATH">/usr/gdata/e3sm/install/quartz/netcdf-fortran/</env>
<env name="NETCDF_PATH">/usr/workspace/e3sm/install/quartz/netcdf-fortran/</env>
<env name="PNETCDF_PATH">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0</env>
</environment_variables>
</machine>

<machine MACH="quartz">
<DESC>LLNL Linux Cluster, Linux (pgi), 36 pes/node, batch system is Slurm</DESC>
<machine MACH="dane">
<DESC>LLNL Linux Cluster, 112 pes/node, batch system is Slurm</DESC>
<OS>LINUX</OS>
<COMPILERS>intel</COMPILERS>
<MPILIBS>mpich</MPILIBS>
<PROJECT>cbronze</PROJECT>
<CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/quartz</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/gdata/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/dane</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/workspace/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/workspace/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/p/lustre2/$USER/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/p/lustre2/$USER/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/usr/gdata/e3sm/tools/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/usr/workspace/e3sm/tools/cprnc</CCSM_CPRNC>
<GMAKE_J>8</GMAKE_J>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>72</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>36</MAX_MPITASKS_PER_NODE>
<SUPPORTED_BY>boutte3 -at- llnl.gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>224</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>112</MAX_MPITASKS_PER_NODE>
<mpirun mpilib="mpi-serial">
<executable/>
</mpirun>
Expand All @@ -3084,7 +3084,7 @@
<command name="load">intel-classic/2021.6.0-magic</command>
<command name="load">mvapich2/2.3.7</command>
<command name="load">cmake/3.19.2</command>
<command name="use --append">/usr/gdata/e3sm/install/quartz/modulefiles</command>
<command name="use --append">/usr/workspace/e3sm/install/quartz/modulefiles</command>
<command name="load">hdf5/1.12.2</command>
<command name="load">netcdf-c/4.9.0</command>
<command name="load">netcdf-fortran/4.6.0</command>
Expand All @@ -3096,7 +3096,7 @@
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDF_PATH">/usr/gdata/e3sm/install/quartz/netcdf-fortran/</env>
<env name="NETCDF_PATH">/usr/workspace/e3sm/install/quartz/netcdf-fortran/</env>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the next step will be to redo this install, so maybe we can leave it like this for now. But having quartz in the name of the path I think would be confusing, since quartz no longer exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll leave this for the moment. There will be another update to use the new modules I'm building once I sort out the last couple issues.

<env name="PNETCDF_PATH">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0</env>
</environment_variables>
</machine>
Expand Down