Skip to content

Commit

Permalink
Merge branch 'jonbob/mpas/update-070617' (PR #1630)
Browse files Browse the repository at this point in the history
Update MPAS components and framework, bring in threading optimizations

This PR updates all MPAS submodules and framework, including:
* bfb framework threading optimization from Abhinov MPAS#1237;
* bfb mpas-o threading optimization from Abhinov MPAS#1235;
* update path to new Albany install (cherry-picked from branch
  agsalin/machines/AlbanyNewInstall);
* various framework and component updates.

Tested with:
* PET_Ln9.T62_oEC60to30v3.GMPAS-NYF.edison_intel
* SMS.T62_oEC60to30v3.GMPAS-IAF.edison_intel (bfb with current master)
* PET.T62_oEC60to30v3.GMPAS-NYF.titan

Note: this commit is answer-changing only for compsets with MPASLI

[non-BFB]
  • Loading branch information
jonbob committed Aug 7, 2017
2 parents bd8888b + cf1d7e5 commit 5a3529e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
8 changes: 4 additions & 4 deletions config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ for mct, etc.
<PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/usr/lib64 -L/usr/lib64/atlas -lblas -llapack</ADD_SLIBS>
<CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
<ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
<ALBANY_PATH>/data/acme/AlbanyTrilinos_06262017/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="intel" MACH="sandia-srn-sems">
Expand All @@ -660,7 +660,7 @@ for mct, etc.
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/usr/lib64 -L/usr/lib64/atlas -lblas -llapack</ADD_SLIBS>
<ADD_SLIBS> /projects/sems/install/rhel6-x86_64/sems/compiler/intel/15.0.2/base/mkl/lib/mic/libmkl_scalapack_lp64.a -Wl,--start-group /projects/sems/install/rhel6-x86_64/sems/compiler/intel/15.0.2/base/mkl/lib/intel64/libmkl_intel_lp64.a /projects/sems/install/rhel6-x86_64/sems/compiler/intel/15.0.2/base/mkl/lib/intel64/libmkl_core.a /projects/sems/install/rhel6-x86_64/sems/compiler/intel/15.0.2/base/mkl/lib/intel64/libmkl_sequential.a -Wl,--end-group /projects/sems/install/rhel6-x86_64/sems/compiler/intel/15.0.2/base/mkl/lib/mic/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
<CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
<ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
<ALBANY_PATH>/data/acme/AlbanyTrilinos_06262017/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="gnu" MACH="anlworkstation">
Expand All @@ -684,7 +684,7 @@ for mct, etc.
<PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos_06262017/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="intel" MACH="chama">
Expand All @@ -699,7 +699,7 @@ for mct, etc.
<PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos_06262017/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="intel" MACH="redsky">
Expand Down
1 change: 1 addition & 0 deletions config/acme/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@
<command name="load">sems-openmpi/1.8.7</command>
<command name="load">sems-cmake/2.8.12</command>
<command name="load">sems-netcdf/4.4.1/exo_parallel</command>
<command name="load">sems-boost/1.58.0/base</command>
</modules>
</module_system>
<environment_variables>
Expand Down

0 comments on commit 5a3529e

Please sign in to comment.