Skip to content

Commit

Permalink
Update path to new Albany install: redsky, edison
Browse files Browse the repository at this point in the history
A new MPAS Landice tag, to be pulled into ACME in
the next few weeks, will have an updated interface
to Albany/FELIX. I have started to upgrade the
Albany installation on targeted machines. In this
commit, we update the path in the ALBANY_PATH
variable in config_compiler.xml for some machines.

This makes that change for redsky/chama, edison,
and sandia-srn-sems machines.
ToDo: install new albany on Mira, Titan, Anvil,
and other machines.

The hope is that the test MPASLIALB in
acme_integration will pass with this change on
these machines when done in concert with
the MPAS Landice update.
  • Loading branch information
agsalin authored and jonbob committed Jul 6, 2017
1 parent b48a232 commit cf1d7e5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
17 changes: 5 additions & 12 deletions config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ for mct, etc.
<MPICC> cc </MPICC>
<MPICXX> CC </MPICXX>
<PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
<ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_09232015/Albany/build/install</ALBANY_PATH>
<ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_06262017/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="intel17" MACH="edison">
Expand Down Expand Up @@ -697,7 +697,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 @@ -709,7 +709,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 @@ -733,7 +733,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 @@ -748,7 +748,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 All @@ -765,13 +765,6 @@ for mct, etc.
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
</compiler>

<compiler COMPILER="gnu" MACH="penn">
<NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
<PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -lblas </ADD_SLIBS>
<ADD_CPPFLAGS> -DHAVE_COMM_F2C </ADD_CPPFLAGS>
</compiler>

<compiler COMPILER="pgi" MACH="sierra">
<NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
<MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
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 @@ -616,6 +616,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.3.2/parallel</command>
<command name="load">sems-boost/1.58.0/base</command>
</modules>
</module_system>
<environment_variables>
Expand Down

0 comments on commit cf1d7e5

Please sign in to comment.