Skip to content
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.

Sign up for GitHub

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

Jump to bottom

brings in changes needed for FMS 2021.03 #762

Merged
merged 17 commits into from
Aug 25, 2021
Merged

brings in changes needed for FMS 2021.03 #762

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe348a8
brings in changes needed for FMS 2021.03
bensonr Aug 20, 2021
49fb76c
updated ufs_common modulefiles to use newly installed FMS 2021.03 lib…
bensonr Aug 20, 2021
2da6e4f
updated .gitmodules to point to bensonr fork for fv3atm
bensonr Aug 23, 2021
03ad167
Merge remote-tracking branch 'origin/develop' into fms_2021.03
bensonr Aug 23, 2021
3b4f75a
had to redo the stochastic physics submodule update as the merge didn…
bensonr Aug 23, 2021
ac70953
resetting the CICE-interface/CICE submodule update as the merge didn'…
bensonr Aug 23, 2021
787a1c3
updated ufs_wcoss_cray* modulefiles to utilize fms_2021.03
bensonr Aug 23, 2021
1e46b32
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Aug 23, 2021
632b99f
new hash for FV3 (fv3atm repo) with gnu fixes
bensonr Aug 23, 2021
d14691c
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Aug 23, 2021
730832c
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Aug 23, 2021
88284fa
Regression test log for cheyenne.intel
climbfuji Aug 24, 2021
e8a6109
Regression test log for cheyenne.gnu
climbfuji Aug 24, 2021
b1218a1
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Aug 24, 2021
70815d9
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Aug 24, 2021
5183d31
RT JOBS PASSED: wcoss cray and dell. Log file uploaded
bensonr Aug 25, 2021
7d78278
revert .gitmodules for final merge
bensonr Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
url = https://github.com/bensonr/fv3atm
branch = develop
[submodule "NEMS"]
path = NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 5 files
+2 −0 CMakeLists.txt
+1 −1 atmos_cubed_sphere
+2 −0 atmos_model.F90
+8 −6 ccpp/data/GFS_typedefs.F90
+461 −221 io/FV3GFS_io.F90
2 changes: 1 addition & 1 deletion modulefiles/ufs_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_1
module load fms/2020.04.03
module load fms/2021.03

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8_1_1-debug
module load fms/2020.04.03
module load fms/2021.03

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module load udreg
module load ugni

module load esmf/811
module load fms/2020.04.03
module load fms/2021.03

module swap pmi pmi/5.0.11

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss_cray_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module load udreg
module load ugni

module load esmf/811-debug
module load fms/2020.04.03
module load fms/2021.03

module swap pmi pmi/5.0.11

Expand Down
1,796 changes: 1,504 additions & 292 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions tests/fv3_conf/compile_slurm.IN_gaea
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#SBATCH -e err
#SBATCH -o out
#SBATCH --account=@[ACCNR]
#SBATCH --qos=@[QUEUE]
#SBATCH --clusters=@[PARTITION]
##SBATCH --qos=@[QUEUE]
#SBATCH --clusters=es
#SBATCH --partition=eslogin
bensonr marked this conversation as resolved.
Show resolved Hide resolved
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=8
#SBATCH --time=30
Expand Down