forked from NCAR/fv3atm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove IPD steps 3 and 5 (NOAA-EMC#357)
Reduce SIMDMULTIARCH sets from four to two in cmake/Intel.cmake * First cleanup of regression test config tests/rt.conf * tests/rt.sh: reduce number of build jobs on jet.intel from 10 to 5; skip-ci * Remove flags -f and -s from rt.sh, remove SET logic, remove corresponding column in all rt*conf files * Update usage in rt.sh, add modulefiles/jet.intel/fv3_debug; skip-ci * CCPP is default in cmake build * Add debug modulefiles for linux.gnu and macosx.gnu * Update submodule pointer for fv3atm * Change logic in CMakeLists.txt and tests/compile.sh so that 32BIT=ON automatically sets DYN32=ON; skip-ci * Move logic to set DYN32 - depending on 32BIT setting - to fv3atm * Remove -DCCPP=ON from tests/compile.sh; update submodule pointer for fv3atm; skip-ci
- Loading branch information
Showing
18 changed files
with
785 additions
and
697 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
27 files
| +51 −63 | CMakeLists.txt | |
| +1 −1 | atmos_cubed_sphere | |
| +355 −450 | atmos_model.F90 | |
| +0 −4 | ccpp/CMakeLists.txt | |
| +3 −3 | ccpp/config/ccpp_prebuild_config.py | |
| +0 −0 | ccpp/data/CCPP_data.F90 | |
| +1 −1 | ccpp/data/CCPP_data.meta | |
| +0 −0 | ccpp/data/CCPP_typedefs.F90 | |
| +1 −1 | ccpp/data/CCPP_typedefs.meta | |
| +43 −0 | ccpp/data/CMakeLists.txt | |
| +100 −416 | ccpp/data/GFS_typedefs.F90 | |
| +1 −1 | ccpp/data/GFS_typedefs.meta | |
| +29 −5 | ccpp/driver/CMakeLists.txt | |
| +0 −120 | ccpp/driver/GFS_diagnostics.F90 | |
| +180 −0 | ccpp/driver/GFS_init.F90 | |
| +2 −9 | ccpp/driver/GFS_restart.F90 | |
| +1 −1 | ccpp/physics | |
| +7 −188 | gfsphysics/CMakeLists.txt | |
| +0 −94 | gfsphysics/GFS_layer/GFS_abstraction_layer.F90 | |
| +0 −1,114 | gfsphysics/GFS_layer/GFS_driver.F90 | |
| +5 −8 | io/CMakeLists.txt | |
| +267 −422 | io/FV3GFS_io.F90 | |
| +0 −33 | ipd/CMakeLists.txt | |
| +0 −121 | ipd/IPD_driver.F90 | |
| +0 −165 | ipd/IPD_typedefs.F90 | |
| +0 −58 | ipd/makefile | |
| +2 −4 | stochastic_physics/CMakeLists.txt |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #!/bin/bash | ||
|
|
||
| #%Module###################################################################### | ||
| ## | ||
| ## UFS prerequisites: Linux (tested: Ubuntu) with gcc/gfortran compilers | ||
|
|
||
| echo "Setting environment variables for NEMSfv3gfs on Linux with gcc/gfortran" | ||
|
|
||
| ## | ||
| ## load programming environment: compiler, flags, paths | ||
| ## | ||
| export CC=${CC:-mpicc} | ||
| export CXX=${CXX:-mpicxx} | ||
| export F77=${F77:-mpif77} | ||
| export F90=${F90:-mpif90} | ||
| export FC=${FC:-mpif90} | ||
|
|
||
| ## | ||
| ## set up variables for ../cmake/configure_linux.gnu.cmake | ||
| ## | ||
| export CMAKE_Platform=linux.gnu | ||
| export CMAKE_C_COMPILER=${CC} | ||
| export CMAKE_CXX_COMPILER=${CXX} | ||
| export CMAKE_Fortran_COMPILER=${FC} | ||
|
|
||
| ## | ||
| ## use own NetCDF library | ||
| ## | ||
| export NETCDF=${NETCDF:-/home/builder/opt} | ||
|
|
||
| ## | ||
| ## use SIONlib library if installed and environment variable is set | ||
| ## | ||
| SIONLIB=${SIONLIB:-} | ||
| if [ ! "x$SIONLIB" == "x" ]; then | ||
| echo "Use SIONlib installation in ${SIONLIB}" | ||
| export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64" | ||
| export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none" | ||
| fi | ||
|
|
||
| ## | ||
| ## use pre-compiled EMSF library for above compiler / MPI combination | ||
| ## | ||
| export ESMFMKFILE=${ESMFMKFILE:-/home/builder/opt/lib/esmf.mk} | ||
|
|
||
| ## | ||
| ## NCEP libraries (need to download and build manually, see doc/README_{UBUNTU,CENTOS,...}.txt and https://github.com/NCAR/NCEPlibs) | ||
| ## | ||
| export NCEPLIBS_DIR=${NCEPLIBS_DIR:-/home/builder/opt} | ||
| export CMAKE_PREFIX_PATH=${NCEPLIBS_DIR} |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #!/bin/bash | ||
|
|
||
| #%Module###################################################################### | ||
| ## | ||
| ## UFS prerequisites: MACOSX with clang/gfortran compilers | ||
|
|
||
| echo "Setting environment variables for NEMSfv3gfs on MACOSX with gcc/gfortran or clang/gfortran" | ||
|
|
||
| ## | ||
| ## load programming environment: compiler, flags, paths | ||
| ## | ||
| export CC=${MPICC:-mpicc} | ||
| export CXX=${MPICXX:-mpicxx} | ||
| export F77=${MPIF77:-mpif77} | ||
| export F90=${MPIF90:-mpif90} | ||
| export FC=${MPIFORT:-mpifort} | ||
| export CPP=${CPP:-"${F90} -E -x f95-cpp-input"} | ||
| export MPICC=${MPICC:-mpicc} | ||
| export MPIF90=${MPIF90:-mpif90} | ||
|
|
||
| ## | ||
| ## load cmake | ||
| ## | ||
| export CMAKE_C_COMPILER=${CC} | ||
| export CMAKE_CXX_COMPILER=${CXX} | ||
| export CMAKE_Fortran_COMPILER=${FC} | ||
| export CMAKE_Platform=macosx.gnu | ||
|
|
||
| ## | ||
| ## use SIONlib library if installed and environment variable is set | ||
| ## | ||
| SIONLIB=${SIONLIB:-} | ||
| if [ ! "x$SIONLIB" == "x" ]; then | ||
| echo "Use SIONlib installation in ${SIONLIB}" | ||
| export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64" | ||
| export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none" | ||
| fi | ||
|
|
||
| ## | ||
| ## Intel MKL library | ||
| ## | ||
| export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl} | ||
| export MKL_INC="-m64 -I${MKL_DIR}/include" | ||
| export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl" |
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.