Skip to content

Commit

Permalink
Merge branch 'mchen0312/clm/traits' (PR #453)
Browse files Browse the repository at this point in the history 
Add 2 machines itasca and mesabi from Minnesota Supercomputing Institute

[BFB]
  • Loading branch information
@rljacob
rljacob committed Jun 23, 2016
2 parents 5c4de39 + 245e000 commit cc98c12
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 0 deletions.
54 changes: 54 additions & 0 deletions cime/machines-acme/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,4 +1164,58 @@ for mct, etc.
<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
</compiler>

<compiler COMPILER="intel" MACH="mesabi">
<ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
<ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
<ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
<ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
<FREEFLAGS> -free </FREEFLAGS>
<FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
<FFLAGS> -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -I/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </FFLAGS>
<CFLAGS> -O2 -fp-model precise -I/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </CFLAGS>
<FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
<FC_AUTO_R8> -r8 </FC_AUTO_R8>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<MPIFC> mpiifort </MPIFC>
<MPICC> mpiicc </MPICC>
<MPICXX> mpiicpc </MPICXX>
<CXX_LINKER>FORTRAN</CXX_LINKER>
<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
<ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
<ADD_LDFLAGS> -lnetcdff </ADD_LDFLAGS>
<ADD_SLIBS>-L/soft/netcdf/fortran-4.4-intel-sp1-update3-parallel/lib -lnetcdff -L/soft/hdf5/hdf5-1.8.13-intel-2013-sp1-update3-impi-5.0.0.028/lib -openmp -fPIC -lnetcdf -lnetcdf -L/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -lpthread -lm </ADD_SLIBS>
</compiler>

<compiler COMPILER="intel" MACH="itasca">
<ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
<ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
<ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
<ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
<FREEFLAGS> -free </FREEFLAGS>
<FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
<ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
<FFLAGS> -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -I/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </FFLAGS>
<CFLAGS> -O2 -fp-model precise -I/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/include </CFLAGS>
<FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
<FC_AUTO_R8> -r8 </FC_AUTO_R8>
<SFC> ifort </SFC>
<SCC> icc </SCC>
<SCXX> icpc </SCXX>
<MPIFC> mpiifort </MPIFC>
<MPICC> mpiicc </MPICC>
<MPICXX> mpiicpc </MPICXX>
<CXX_LINKER>FORTRAN</CXX_LINKER>
<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
<ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
<SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
<ADD_LDFLAGS> -lnetcdff </ADD_LDFLAGS>
<ADD_SLIBS>-L/soft/netcdf/fortran-4.4-intel-sp1-update3-parallel/lib -lnetcdff -L/soft/hdf5/hdf5-1.8.13-intel-2013-sp1-update3-impi-5.0.0.028/lib -openmp -fPIC -lnetcdf -lnetcdf -L/soft/intel/x86_64/2013/composer_xe_2013/composer_xe_2013_sp1.3.174/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -lpthread -lm </ADD_SLIBS>
</compiler>

</config_compilers>
30 changes: 30 additions & 0 deletions cime/machines-acme/env_mach_specific.itasca
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#! /bin/csh -f

# -------------------------------------------------------------------------
# USERDEFINED
# Edit this file to add module load or other paths needed for the build
# and run on the system. Can also include general env settings for machine.
# Some samples are below
# -------------------------------------------------------------------------

#source /opt/modules/default/init/csh
#if ( $COMPILER == "pgi" ) then
# module load pgi
#endif
#module load netcdf
#limit coredumpsize unlimited
source /soft/Modules/3.2.6/init/csh
module load gcc/4.8.2
module load intel/2013/sp1_update3
module load impi/5.0.0.028/intel
module load pnetcdf/1.5.0
module load netcdf/4.3.2-intel-sp1-update3-parallel
module load netcdf/fortran-4.4-intel-sp1-update3-parallel
module load xerces/3.1.1_intel
module load esmf/6.3.0rp1
module load cmake/3.0.0
limit coredumpsize unlimited
limit stacksize unlimited
setenv NETCDF_PATH "/soft/netcdf/fortran-4.4-intel-sp1-update3-parallel"
setenv compile_threaded true

30 changes: 30 additions & 0 deletions cime/machines-acme/env_mach_specific.mesabi
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#! /bin/csh -f

# -------------------------------------------------------------------------
# USERDEFINED
# Edit this file to add module load or other paths needed for the build
# and run on the system. Can also include general env settings for machine.
# Some samples are below
# -------------------------------------------------------------------------

#source /opt/modules/default/init/csh
#if ( $COMPILER == "pgi" ) then
# module load pgi
#endif
#module load netcdf
#limit coredumpsize unlimited
source /soft/Modules/3.2.6/init/csh
module load gcc/4.8.2
module load intel/2013/sp1_update3
module load impi/5.0.0.028/intel
module load pnetcdf/1.5.0
module load netcdf/4.3.2-intel-sp1-update3-parallel
module load netcdf/fortran-4.4-intel-sp1-update3-parallel
module load xerces/3.1.1_intel
module load esmf/6.3.0rp1
module load cmake/3.0.0
limit coredumpsize unlimited
limit stacksize unlimited
setenv NETCDF_PATH "/soft/netcdf/fortran-4.4-intel-sp1-update3-parallel"
setenv compile_threaded true

1 change: 1 addition & 0 deletions cime/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1262,5 +1262,6 @@
</mpirun>
</batch_system>
</machine>

<default_run_suffix>$config{'EXEROOT'}/cesm.exe >> cesm.log.$LID 2>&amp;1</default_run_suffix>
</config_machines>

0 comments on commit cc98c12

Please sign in to comment.