-
Notifications
You must be signed in to change notification settings - Fork 249
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove IPD steps 3 and 5 #357
Merged
junwang-noaa
merged 39 commits into
ufs-community:develop
from
climbfuji:remove_ipd_step3_and_5
Jan 15, 2021
Merged
Changes from 36 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
3f1bf6f
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji 83c6c12
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji aef5c69
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji a48f2b8
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji bc40ab9
Update submodule pointer for fv3atm; skip-ci
climbfuji 864058f
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 440566a
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji 153637b
Reduce SIMDMULTIARCH sets from four to two in cmake/Intel.cmake
climbfuji 5e7648d
First cleanup of regression test config tests/rt.conf
climbfuji d0ba358
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji e3bedfa
tests/rt.sh: reduce number of build jobs on jet.intel from 10 to 5; s…
climbfuji 2d06ed5
Remove flags -f and -s from rt.sh, remove SET logic, remove correspon…
climbfuji b6fa3e9
Update usage in rt.sh, add modulefiles/jet.intel/fv3_debug; skip-ci
climbfuji 4f74896
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 2f4c407
Update submodule pointer for fv3atm; skip-ci
climbfuji 8301422
Update submodule pointer for fv3atm; skip-ci
climbfuji 9a828b5
Update submodule pointer for fv3atm; skip-ci
climbfuji 8f1fcc3
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 992f082
Update regression test baseline date tag in tests/rt.sh
climbfuji 00d34e1
Remvoe tests/rt_acorn.conf and run GFS v15p2 and GFS v16beta DEBUG te…
climbfuji 698d54a
Regression test logs for all tier-1 platforms
climbfuji 1c8f0c4
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji d071f0f
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 6e3eadc
Update .gitmodules and submodule pointers for NEMS and fv3atm for cod…
climbfuji dbfd969
CCPP is default in cmake build
climbfuji 91b5d14
Add debug modulefiles for linux.gnu and macosx.gnu
climbfuji 622a58b
Merge branch 'simd_update_and_rt_cleanup_20201231' of https://github.…
climbfuji c1552c0
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 17a592a
Update submodule pointer for fv3atm
climbfuji 223323c
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji 90bcf59
Change logic in CMakeLists.txt and tests/compile.sh so that 32BIT=ON …
climbfuji c769821
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji b8a6186
Move logic to set DYN32 - depending on 32BIT setting - to fv3atm
climbfuji 7245fa5
Address reviewer comments
climbfuji 0601f77
Update submodule pointer for fv3atm
climbfuji 576c498
Regression test logs for all systems except wcoss_dell_p3; skip-ci
climbfuji 0ea9e59
Remove -DCCPP=ON from tests/compile.sh; update submodule pointer for …
climbfuji 8461e1f
Regression test logs for wcoss_dell_p3, hera.intel (rerun), hera.gnu …
climbfuji ca4462e
Revert change to .gitmodules and update submodule pointers for NEMS a…
climbfuji File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
28 files
| +8 −4 | .gitmodules | |
| +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 | |
| +26 −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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we keep using 2.7? When do we deprecate it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2.7 is only used if 3 isn't found. I think all we need to do is to check that each of the systems we are using, including the generic platforms and the dinosaurs (wcoss_cray), has Python 3 and test if not used already. Then remove this logic in a future PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I created an issue for this so that we don't forget.