forked from ufs-community/ufs-weather-model
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update gsl/develop from develop 2020/12/08 (#50)
* Updates to stochastic_physics_wrapper (ufs-community#280) Fix to stochastic_physics_wrapper to allow for random patterns to update at a longer time-step than model Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> * Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T (ufs-community#304) Update the modulefile for jet.intel to enable UPP v10.0.0. The hpc-stack v1.0.0 pre-release is used for this. Small changes are made to tests.rt.sh for jet.intel and gaea.intel (consistency with other platforms). The submodule pointer update for fv3atm addresses bugs in the ufs-weather-model with frac_grid=T and GFDL microphysics, and with restarting the model when frac_grid=T (from @shansun6 and @SMoorthi-emc). * Feature/update mom6 and retain b4b results for 025x025 resolution (ufs-community#290) * point MOM6 to new branch which corresponding to GFDL 20201022 commit * modify fms_files.cmake and mom6_files.cmake to reflect changes in MOM6 code as this version of MOM6 contains some file deletion, new files being added and renaming of files * manually set MOM6 parameters in order to retain origonal results for 0.25x0.25 resolution * update MOM6 to include Bugfix for mom6solo to be built * modify compile.sh to allow mom6solo compiling * modify MOM_input_template for all resolutions based on GFDL MOM6-example main branch update on 20201022 * change executable permissions for CMakeLists.txt * chmod 644 to 6 files Dom pointed out * chmod for CMakeLists.txt and tests/compile.sh * change baseline directpory to 20201202 in rt.sh * Update CICE, Move regression test input outside baseline directory (ufs-community#270) *Updates CICE to most recent develop branch of NOAA-EMC * Sets n_aero (number of aerosols) in ice_in_template to 0. * removes trailing whitespace from ice_in * moves regression test input outside baseline directory (ufs-weather PR ufs-community#312) Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com> * Revert change to .gitmodules and update submodule pointer for fv3atm Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: jiandewang <jiande.wang@noaa.gov> Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com>
- Loading branch information
5 people
authored
Dec 8, 2020
1 parent
d4de9e6
commit 7a249f2
Showing
70 changed files
with
3,347 additions
and
7,107 deletions.
There are no files selected for viewing
Submodule CICE
updated
45 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
Submodule FV3
updated
4 files
| +5 −3 | atmos_model.F90 | |
| +1 −1 | ccpp/physics | |
| +27 −18 | io/FV3GFS_io.F90 | |
| +64 −47 | stochastic_physics/stochastic_physics_wrapper.F90 |
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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE) | ||
| set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE) | ||
| set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE) | ||
| set(AVX2 OFF CACHE BOOL "Enable AVX2 instruction set" FORCE) | ||
| set(SIMDMULTIARCH ON CACHE BOOL "Enable multi-target SIMD instruction sets" FORCE) |
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 |
|---|---|---|
| @@ -1,53 +1,43 @@ | ||
| #%Module###################################################################### | ||
| ## | ||
| ## nems prerequisites | ||
| ## | ||
| #%Module | ||
|
|
||
| proc ModulesHelp {} { | ||
| puts stderr "The prerequisites for compiling or running FV3 on Jet/Intel" | ||
| puts stderr "\tcit - loads modules required for building and running UFS Model on Jet/Intel" | ||
| } | ||
|
|
||
| module purge | ||
| module-whatis "loads UFS Model prerequisites for Jet/Intel" | ||
|
|
||
| ## | ||
| ## load contrib environment | ||
| ## load slurm utils (arbitrary.pl layout.pl) | ||
| ## | ||
| module use -a /contrib/sutils/modulefiles | ||
| module use /contrib/sutils/modulefiles | ||
| module load sutils | ||
|
|
||
| module load intel/18.0.5.274 | ||
| module load impi/2018.4.274 | ||
|
|
||
| ## | ||
| ## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination | ||
| ## | ||
| module use -a /lfs4/HFIP/hfv3gfs/software/ufs-stack-20200909/intel-18.0.5.274/impi-2018.4.274/modules | ||
|
|
||
| module load libpng/1.6.35 | ||
| module load netcdf/4.7.4 | ||
| module load esmf/8.1.0bs27 | ||
|
|
||
| module load bacio/2.4.0 | ||
| module load crtm/2.3.0 | ||
| module load g2/3.4.0 | ||
| module load g2tmpl/1.9.0 | ||
| module load ip/3.3.0 | ||
| module load nceppost/dceca26 | ||
| module load nemsio/2.5.1 | ||
| module load sp/2.3.0 | ||
| module load w3emc/2.7.0 | ||
| module load w3nco/2.4.0 | ||
|
|
||
| module load gfsio/1.4.0 | ||
| module load sfcio/1.4.0 | ||
| module load sigio/2.3.0 | ||
|
|
||
| ## | ||
| ## load cmake | ||
| ## | ||
| module load cmake/3.16.1 | ||
| setenv CMAKE_C_COMPILER mpiicc | ||
| setenv CMAKE_CXX_COMPILER mpiicpc | ||
| setenv CMAKE_Fortran_COMPILER mpiifort | ||
| setenv CMAKE_Platform jet.intel | ||
|
|
||
| module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack | ||
|
|
||
| # At this time (2020/11/30), this is the pre-release version 1.0.0 | ||
| module load hpc/1.1.0 | ||
| module load hpc-intel/18.0.5.274 | ||
| module load hpc-impi/2018.4.274 | ||
|
|
||
| module load jasper/2.0.22 | ||
| module load zlib/1.2.11 | ||
| module load png/1.6.35 | ||
|
|
||
| module load hdf5/1.10.6 | ||
| module load netcdf/4.7.4 | ||
| module load pio/2.5.1 | ||
| module load esmf/8_1_0_beta_snapshot_27 | ||
|
|
||
| module load bacio/2.4.1 | ||
| module load crtm/2.3.0 | ||
| module load g2/3.4.1 | ||
| module load g2tmpl/1.9.1 | ||
| module load ip/3.3.3 | ||
| module load nemsio/2.5.2 | ||
| module load sp/2.3.3 | ||
| module load w3emc/2.7.3 | ||
| module load w3nco/2.4.1 | ||
| module load upp/10.0.0 |
Submodule stochastic_physics
updated
from 6eac84 to e4913c
Oops, something went wrong.