Skip to content

Commit

Permalink
merge commit to pull in branch changes from main repo
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Salinger committed Oct 18, 2015
2 parents 063f8bd + 2dd6967 commit 97a3fdd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cime/machines-acme/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ for mct, etc.
<PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
<ADD_SLIBS> $(shell nf-config --flibs) </ADD_SLIBS>
<TRILINOS_PATH>/lustre/atlas/world-shared/cli900/cesm/software/Trilinos/Trilinos-11.10.2_gptl/titan-pgi-ci-nophal/install</TRILINOS_PATH>
<CXX_LIBS> -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
<CXX_LIBS> -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o /opt/gcc/4.8.2/snos/lib64/libstdc++.a </CXX_LIBS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
<MPIFC> ftn </MPIFC>
<MPICC> cc </MPICC>
Expand Down

0 comments on commit 97a3fdd

Please sign in to comment.