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

Fix mpich bug and other Titan issues #1315

Merged
merged 2 commits into from
Mar 16, 2017
Merged

Fix mpich bug and other Titan issues #1315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba879fc
Fixing Module issues on titan
mrnorman Feb 23, 2017
feb3c5b
Pat's config file that fixed runtime issues.
mrnorman Feb 24, 2017
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
87 changes: 38 additions & 49 deletions cime/cime_config/acme/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,78 +1457,71 @@
if compiler and mpilib condition applies -->
<!-- Always execute -->
<modules>
<!-- <command name="purge"></command>

<command name="load">eswrap</command>
<command name="load">PrgEnv-pgi cray-mpich</command>
<command name="add">craype-interlagos</command>
<command name="add">DefApps site-aprun</command>
<command name="add">aprun-usage altd</command>
<command name="load">python/2.7.9</command>
<command name="unload">subversion</command>
<command name="load">subversion/1.8.3</command>
<command name="unload">cmake</command>
<command name="load">cmake/2.8.10.2</command>
-->
<!-- reinstate old section -->
<command name="rm">PrgEnv-intel</command>
<command name="rm">pgi</command>
<command name="rm">PrgEnv-pgi</command>
</modules>

<modules compiler="pgiacc"> <!-- changing pgi_acc to pgiacc -->
<command name="use">/ccs/home/norton/.modules</command>
<command name="rm">PrgEnv-cray</command>
<command name="rm">PrgEnv-gnu</command>
<command name="rm">PrgEnv-intel</command>
<command name="rm">PrgEnv-pathscale</command>
<command name="rm">intel</command>
<command name="rm">pgi</command>
<command name="rm">gcc</command>
<command name="rm">cray</command>
<command name="rm">pathscale</command>
<command name="rm">parallel-netcdf</command>
<command name="rm">netcdf</command>
<command name="load">PrgEnv-pgi</command>
<command name="switch">pgi pgi/15.9.lustre</command>
<command name="rm">cray-mpich</command>
<command name="rm">cray-mpich2</command>
<command name="rm">cray-libsci</command>
<command name="rm">esmf</command>
<command name="rm">atp</command>
<command name="rm">esmf</command>
<command name="rm">cudatoolkit</command>
<command name="rm">xt-libsci</command>
<command name="rm">cray-netcdf</command>
<command name="rm">cray-netcdf-hdf5parallel</command>
<command name="rm">cray-parallel-netcdf</command>
<command name="rm">subversion</command>
<command name="rm">cmake</command>

<command name="load">python/2.7.9</command>
<command name="load">subversion</command>
<command name="load">cmake/2.8.10.2</command>
-->
</modules>

<modules compiler="pgiacc"> <!-- changing pgi_acc to pgiacc -->
<command name="use">/ccs/home/norton/.modules</command>
<command name="load">PrgEnv-pgi</command>
<command name="switch">pgi pgi/15.9.lustre</command>
<command name="load">cray-mpich/7.4.0</command>
<command name="load">cray-libsci/16.06.1</command>
<command name="load">esmf/5.2.0rp2</command>
<command name="load">atp/2.0.2</command>
<command name="load">esmf/5.2.0rp2</command>
<command name="load">cudatoolkit</command>
</modules>
<modules compiler="pgi">
<command name="rm">PrgEnv-cray</command>
<command name="rm">PrgEnv-gnu</command>
<command name="rm">PrgEnv-intel</command>
<command name="rm">PrgEnv-pathscale</command>
<command name="load">PrgEnv-pgi</command>
<command name="switch">pgi pgi/15.7.0</command>
<command name="rm">cray-mpich</command>
<command name="rm">cray-libsci</command>
<command name="rm">atp</command>
<command name="rm">esmf</command>
<command name="load">cray-mpich/7.4.0</command>
<command name="load">cray-libsci/16.06.1</command>
<command name="load">esmf/5.2.0rp2</command>
<command name="load">atp/2.0.2</command>
<command name="load">esmf/5.2.0rp2</command>
</modules>
<modules compiler="intel">
<command name="rm">PrgEnv-pgi</command>
<command name="rm">PrgEnv-cray</command>
<command name="rm">PrgEnv-gnu</command>
<command name="rm">PrgEnv-pathscale</command>
<command name="load">PrgEnv-intel</command>
<!-- command name="switch">intel intel/15.0.2.164</command -->
<command name="rm">intel</command>
<command name="rm">cray-libsci</command>
<command name="rm">cray-mpich</command>
<command name="rm">atp</command>
<command name="load">intel/15.0.2.164</command>
<command name="load">cray-libsci/16.06.1</command>
<command name="load">cray-mpich/7.4.0</command>
<command name="load">atp/2.0.2</command>
</modules>
<modules compiler="cray">
<command name="rm">PrgEnv-pgi</command>
<command name="rm">PrgEnv-gnu</command>
<command name="rm">PrgEnv-intel</command>
<command name="rm">PrgEnv-pathscale</command>
<command name="load">PrgEnv-cray</command>
<command name="rm">cce</command>
<command name="rm">cray-mpich</command>
<command name="load">cce/8.5.0</command>
<command name="load">cray-mpich/7.4.0</command>
</modules>
Expand All @@ -1539,17 +1532,13 @@
<modules mpilib="!mpi-serial">
<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
<command name="load">cray-parallel-netcdf/1.7.0</command>
</modules>
<modules>
<command name="load">subversion/1.8.3</command>
<command name="load">cmake/2.8.10.2</command>
</modules>
<!-- Default -->
<!--
set CESM_REPO = `./xmlquery CCSM_REPOTAG -value`
if($status == 0) then
-->
<environment_variables>
set CESM_REPO = `./xmlquery CCSM_REPOTAG -value`
if($status == 0) then
-->
Copy link
Member Author

Choose a reason for hiding this comment

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

This looks like a typo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Nevermind, i see that its commenting out this setting in xml.

Copy link
Contributor

Choose a reason for hiding this comment

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

Compare to the original code, and look at the final product, not just the diff. I just prettied up the indentation. I did not delete the commented out lines because I did not know why they were there.

Copy link
Contributor

Choose a reason for hiding this comment

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

you also left off

   1541 +      <environment_variables>

in the above snippet.

Copy link
Member Author

Choose a reason for hiding this comment

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

Github's code discussion feature will let you start a conversation on any one line of code. But just one.

<environment_variables>
<env name="COMPILER">$COMPILER</env>
<env name="MPILIB">$MPILIB</env>
<env name="CESM_REPO">$CESM_REPO</env>
Expand Down