-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update from NCAR dtc/develop 2019/12/17 (#18)
* update FMS to point to tag 2019.01 of NOAA-GFDL * update stochastic_physics to point to hash 1745422af76d830757cd6035b6ea101e92b4cac1 @pjpegion * update of path to CCPP physics library for CCPP regression tests * add -Wall to compiler flags for GNU compilers * remove warnings for non-existent include directories for GNU compiler * update of regression testing scripts to detect errors in tests/run_test.sh * new regression tests fv3_ccpp_gfs_v15p2, fv3_ccpp_gfs_v15p2_debug, fv3_ccpp_gfs_v16beta, fv3_ccpp_gfs_v16beta_debug * update of rt.conf: remove Cheyenne.intel entries (so that rt.conf is an EMC-maintained regression test configuration; move Cheyenne Intel tests into a separate file that resides in the NCAR dtc/develop branch) * make compile_cmake.sh work with Cheyenne Intel/GNU, and bugfixes for compile_cmake.sh * allow environment variable NEMS_MACHINE to overwrite (or set) MACHINE_ID (see #20 for the corresponding PR for the ufs_public_release branch) * new regression test fv3_ccpp_gsd_sar_25km_debug (but not exercised in default rt.conf) * updates for jet and gaea (note: only supporting rt.sh, not NEMSCompsetRun)
- Loading branch information
1 parent
d311672
commit b41e023
Showing
103 changed files
with
237,096 additions
and
260,264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule FV3
updated
49 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| message("") | ||
| message("Setting configuration for $ENV{CMAKE_Platform}") | ||
| message("") | ||
|
|
||
| get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) | ||
| get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) | ||
| get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) | ||
| message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") | ||
| message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") | ||
| message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") | ||
| message("") | ||
|
|
||
| option(DEBUG "Enable DEBUG mode" OFF) | ||
| option(REPRO "Enable REPRO mode" OFF) | ||
| option(VERBOSE "Enable VERBOSE mode" OFF) | ||
| option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) | ||
| option(OPENMP "Enable OpenMP threading" ON) | ||
| option(AVX2 "Enable AVX2 instruction set" OFF) | ||
|
|
||
| option(INLINE_POST "Enable inline post" OFF) | ||
|
|
||
| include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) | ||
|
|
||
| set(NEMSIO_INC $ENV{NEMSIO_INC}) | ||
| set(POST_INC $ENV{POST_INC}) | ||
| set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) | ||
|
|
||
| set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) | ||
| set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") | ||
|
|
||
| set(NETCDF_INC_DIR $ENV{NETCDF}/include) | ||
| set(NETCDF_LIBDIR $ENV{NETCDF}/lib) | ||
| set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) | ||
|
|
||
| message("") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| message("") | ||
| message("Setting configuration for $ENV{CMAKE_Platform}") | ||
| message("") | ||
|
|
||
| get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) | ||
| get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) | ||
| get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) | ||
| message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") | ||
| message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") | ||
| message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") | ||
| message("") | ||
|
|
||
| option(DEBUG "Enable DEBUG mode" OFF) | ||
| option(REPRO "Enable REPRO mode" OFF) | ||
| option(VERBOSE "Enable VERBOSE mode" OFF) | ||
| option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) | ||
| option(OPENMP "Enable OpenMP threading" ON) | ||
| option(AVX2 "Enable AVX2 instruction set" ON) | ||
|
|
||
| option(INLINE_POST "Enable inline post" OFF) | ||
|
|
||
| include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) | ||
|
|
||
| set(NEMSIO_INC $ENV{NEMSIO_INC}) | ||
| set(POST_INC $ENV{POST_INC}) | ||
| set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) | ||
|
|
||
| set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) | ||
| set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") | ||
|
|
||
| set(NETCDF_INC_DIR $ENV{NETCDF}/include) | ||
| set(NETCDF_LIBDIR $ENV{NETCDF}/lib) | ||
| set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) | ||
|
|
||
| message("") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| message("") | ||
| message("Setting configuration for $ENV{CMAKE_Platform}") | ||
| message("") | ||
|
|
||
| get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME) | ||
| get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME) | ||
| get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME) | ||
| message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})") | ||
| message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})") | ||
| message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})") | ||
| message("") | ||
|
|
||
| option(DEBUG "Enable DEBUG mode" OFF) | ||
| option(REPRO "Enable REPRO mode" OFF) | ||
| option(VERBOSE "Enable VERBOSE mode" OFF) | ||
| option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF) | ||
| option(OPENMP "Enable OpenMP threading" ON) | ||
| option(AVX2 "Enable AVX2 instruction set" ON) | ||
|
|
||
| option(INLINE_POST "Enable inline post" OFF) | ||
|
|
||
| include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) | ||
|
|
||
| set(NEMSIO_INC $ENV{NEMSIO_INC}) | ||
| set(POST_INC $ENV{POST_INC}) | ||
| set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB}) | ||
|
|
||
| set(ESMF_MOD ${ESMF_F90COMPILEPATHS}) | ||
| set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}") | ||
|
|
||
| set(NETCDF_INC_DIR $ENV{NETCDF}/include) | ||
| set(NETCDF_LIBDIR $ENV{NETCDF}/lib) | ||
| set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf) | ||
|
|
||
| message("") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.