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

Update to esmf-bs47 across all platforms; add export of openwater_frac_in_atm from FV3 when coupled #493

Closed
wants to merge 19 commits into from
Closed

Update to esmf-bs47 across all platforms; add export of openwater_frac_in_atm from FV3 when coupled #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
08e120f
create branch for update to esmf bs47
DeniseWorthen Mar 25, 2021
89003ac
update modulefiles on dell-p3 for bs47
DeniseWorthen Mar 25, 2021
e342eb6
update FV3
DeniseWorthen Mar 27, 2021
2ceae1b
Merge branch 'develop' into feature/testbs47
DeniseWorthen Mar 27, 2021
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
aa94884
update hera module files for bs47
DeniseWorthen Mar 27, 2021
712960a
hera test logs for bs47
DeniseWorthen Mar 27, 2021
7eed868
failed tests on dell-p3; two compile jobs fail
DeniseWorthen Mar 28, 2021
194a3f1
Merge branch 'feature/testbs47' of https://github.com/DeniseWorthen/u…
DeniseWorthen Mar 28, 2021
6b2a64a
update wcoss-cray esmf
DeniseWorthen Mar 29, 2021
b45157a
update esmf version on additional platforms
DeniseWorthen Mar 29, 2021
ebc201e
update FV3
DeniseWorthen Mar 30, 2021
501fe20
update CMEPS
DeniseWorthen Mar 30, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
afce9f4
Merge branch 'develop' into feature/testbs47
DeniseWorthen Mar 30, 2021
f6f874e
correct location for updated esmf build
DeniseWorthen Mar 30, 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
12 changes: 8 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/DeniseWorthen/fv3atm
branch = feature/testbs47
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand All @@ -24,8 +26,10 @@
branch = develop
[submodule "CMEPS"]
path = CMEPS-interface/CMEPS
url = https://github.com/NOAA-EMC/CMEPS.git
branch = emc/develop
#url = https://github.com/NOAA-EMC/CMEPS.git
#branch = emc/develop
url = https://github.com/DeniseWorthen/CMEPS.git
branch = feature/add_field_to_yaml_file
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 1 files
+31 −26 mediator/fd_nems.yaml
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 4 files
+14 −0 atmos_model.F90
+20 −24 cpl/module_cap_cpl.F90
+6 −5 cpl/module_cplfields.F90
+23 −27 fv3_cap.F90
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/gaea.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/gaea.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ 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-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/hera.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/hera.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/jet.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/jet.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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 esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/orion.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/orion.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ 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-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/wcoss_cray/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ module load gni-headers
module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.1.0bs27
module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
module load esmf/810bs47

module swap pmi pmi/5.0.11

Expand Down
5 changes: 2 additions & 3 deletions modulefiles/wcoss_cray/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ module load gni-headers
module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.1.0bs27

module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
module load esmf/810bs47-debug
module swap pmi pmi/5.0.11

##
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_dell_p3/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ 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 esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_dell_p3/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ 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-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down