Skip to content

Updating NEMS to use bulk formula for purely water points for DATM #35

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

Merged
junwang-noaa merged 4 commits into from
Jun 30, 2020
Merged

Updating NEMS to use bulk formula for purely water points for DATM #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0c236a
update NEMS to datafix branch
junwang-noaa Jun 19, 2020
21ff415
update orion log files
junwang-noaa Jun 29, 2020
97e8a33
update hera RT log files
junwang-noaa Jun 29, 2020
fce4312
point to NOAA-EMC NEMS develop branch
junwang-noaa Jun 30, 2020
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
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = develop
[submodule "DATM"]
path = DATM
url = https://github.com/NOAA-EMC/NEMSdatm
Expand Down
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 8 files
+6 −0 src/conf/module-setup.csh.inc
+6 −0 src/conf/module-setup.sh.inc
+2 −4 src/incmake/component_CCPP.mk
+61 −0 src/incmake/component_CICE6.mk
+1 −0 src/incmake/component_CMEPS.mk
+0 −7 src/incmake/env/cisl/cheyenne.pgi.mk
+16 −0 src/module_EARTH_GRID_COMP.F90
+3 −3 src/module_MEDIATOR.F90
1,560 changes: 780 additions & 780 deletions tests/Compile_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,562 changes: 781 additions & 781 deletions tests/Compile_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 31 additions & 15 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Fri Jun 12 15:51:26 UTC 2020
Mon Jun 29 18:20:17 UTC 2020
Start Regression test


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_cold_start_CFSR
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/MEDIATOR_CFSR
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_51930/cpld_datm_mom6_cice5_cold_cfsr
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_cold_start_CFSR
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/MEDIATOR_CFSR
working dir = /scratch1/NCEPDEV/stmp2/Jun.Wang/S2S_RT/rt_309840/cpld_datm_mom6_cice5_cold_cfsr
Checking test 001 cpld_datm_mom6_cice5_cold_cfsr results ....
Comparing mediator_FBaccumAtmOcn_restart.nc .........OK
Comparing mediator_FBaccumAtm_restart.nc .........OK
Expand All @@ -14,13 +14,17 @@ Checking test 001 cpld_datm_mom6_cice5_cold_cfsr results ....
Comparing mediator_FBAtmOcn_o_restart.nc .........OK
Comparing mediator_FBIce_i_restart.nc .........OK
Comparing mediator_FBOcn_o_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 001 cpld_datm_mom6_cice5_cold_cfsr PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_cold_start_GEFS
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/MEDIATOR_GEFS
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_51930/cpld_datm_mom6_cice5_cold_gefs
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_cold_start_GEFS
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/MEDIATOR_GEFS
working dir = /scratch1/NCEPDEV/stmp2/Jun.Wang/S2S_RT/rt_309840/cpld_datm_mom6_cice5_cold_gefs
Checking test 002 cpld_datm_mom6_cice5_cold_gefs results ....
Comparing mediator_FBaccumAtmOcn_restart.nc .........OK
Comparing mediator_FBaccumAtm_restart.nc .........OK
Expand All @@ -30,13 +34,17 @@ Checking test 002 cpld_datm_mom6_cice5_cold_gefs results ....
Comparing mediator_FBAtmOcn_o_restart.nc .........OK
Comparing mediator_FBIce_i_restart.nc .........OK
Comparing mediator_FBOcn_o_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 002 cpld_datm_mom6_cice5_cold_gefs PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_CFSR
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_CFSR/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_51930/cpld_datm_mom6_cice5_2d_cfsr
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_2d_CFSR
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_2d_CFSR/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Jun.Wang/S2S_RT/rt_309840/cpld_datm_mom6_cice5_2d_cfsr
Checking test 003 cpld_datm_mom6_cice5_2d_cfsr results ....
Comparing RESTART/MOM.res.nc .........OK
Comparing RESTART/MOM.res_1.nc .........OK
Expand All @@ -52,12 +60,17 @@ Checking test 003 cpld_datm_mom6_cice5_2d_cfsr results ....
Comparing mediator_FBaccumAtm_restart.nc .........OK
Comparing mediator_FBaccumIce_restart.nc .........OK
Comparing mediator_FBaccumOcn_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 003 cpld_datm_mom6_cice5_2d_cfsr PASS


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_GEFS
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_GEFS/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_51930/cpld_datm_mom6_cice5_2d_gefs
baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_2d_GEFS
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/DATM-MOM6-CICE5/develop-20200629/RT-Baselines_2d_GEFS/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Jun.Wang/S2S_RT/rt_309840/cpld_datm_mom6_cice5_2d_gefs
Checking test 004 cpld_datm_mom6_cice5_2d_gefs results ....
Comparing RESTART/MOM.res.nc .........OK
Comparing RESTART/MOM.res_1.nc .........OK
Expand All @@ -73,9 +86,12 @@ Checking test 004 cpld_datm_mom6_cice5_2d_gefs results ....
Comparing mediator_FBaccumAtm_restart.nc .........OK
Comparing mediator_FBaccumIce_restart.nc .........OK
Comparing mediator_FBaccumOcn_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 004 cpld_datm_mom6_cice5_2d_gefs PASS


REGRESSION TEST WAS SUCCESSFUL
Fri Jun 12 16:24:48 UTC 2020
Elapsed time: 00h:33m:25s. Have a nice day!
46 changes: 31 additions & 15 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Fri Jun 12 12:48:07 CDT 2020
Mon Jun 29 13:50:53 CDT 2020
Start Regression test


baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_cold_start_CFSR
mediator baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/MEDIATOR_CFSR
working dir = /work/noaa/stmp/dworthen/test/dworthen/S2S_RT/rt_288132/cpld_datm_mom6_cice5_cold_cfsr
baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_cold_start_CFSR
mediator baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/MEDIATOR_CFSR
working dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/rt_338503/cpld_datm_mom6_cice5_cold_cfsr
Checking test 001 cpld_datm_mom6_cice5_cold_cfsr results ....
Comparing mediator_FBaccumAtmOcn_restart.nc .........OK
Comparing mediator_FBaccumAtm_restart.nc .........OK
Expand All @@ -14,13 +14,17 @@ Checking test 001 cpld_datm_mom6_cice5_cold_cfsr results ....
Comparing mediator_FBAtmOcn_o_restart.nc .........OK
Comparing mediator_FBIce_i_restart.nc .........OK
Comparing mediator_FBOcn_o_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 001 cpld_datm_mom6_cice5_cold_cfsr PASS


baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_cold_start_GEFS
mediator baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/MEDIATOR_GEFS
working dir = /work/noaa/stmp/dworthen/test/dworthen/S2S_RT/rt_288132/cpld_datm_mom6_cice5_cold_gefs
baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_cold_start_GEFS
mediator baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/MEDIATOR_GEFS
working dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/rt_338503/cpld_datm_mom6_cice5_cold_gefs
Checking test 002 cpld_datm_mom6_cice5_cold_gefs results ....
Comparing mediator_FBaccumAtmOcn_restart.nc .........OK
Comparing mediator_FBaccumAtm_restart.nc .........OK
Expand All @@ -30,13 +34,17 @@ Checking test 002 cpld_datm_mom6_cice5_cold_gefs results ....
Comparing mediator_FBAtmOcn_o_restart.nc .........OK
Comparing mediator_FBIce_i_restart.nc .........OK
Comparing mediator_FBOcn_o_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 002 cpld_datm_mom6_cice5_cold_gefs PASS


baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_CFSR
mediator baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_CFSR/RESTART
working dir = /work/noaa/stmp/dworthen/test/dworthen/S2S_RT/rt_288132/cpld_datm_mom6_cice5_2d_cfsr
baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_2d_CFSR
mediator baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_2d_CFSR/RESTART
working dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/rt_338503/cpld_datm_mom6_cice5_2d_cfsr
Checking test 003 cpld_datm_mom6_cice5_2d_cfsr results ....
Comparing RESTART/MOM.res.nc .........OK
Comparing RESTART/MOM.res_1.nc .........OK
Expand All @@ -52,12 +60,17 @@ Checking test 003 cpld_datm_mom6_cice5_2d_cfsr results ....
Comparing mediator_FBaccumAtm_restart.nc .........OK
Comparing mediator_FBaccumIce_restart.nc .........OK
Comparing mediator_FBaccumOcn_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 003 cpld_datm_mom6_cice5_2d_cfsr PASS


baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_GEFS
mediator baseline dir = /work/noaa/stmp/libin/RT/DATM-MOM6-CICE5/develop-20200518/RT-Baselines_2d_GEFS/RESTART
working dir = /work/noaa/stmp/dworthen/test/dworthen/S2S_RT/rt_288132/cpld_datm_mom6_cice5_2d_gefs
baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_2d_GEFS
mediator baseline dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/develop-20200629/RT-Baselines_2d_GEFS/RESTART
working dir = /work/noaa/stmp/junwang/test/junwang/S2S_RT/rt_338503/cpld_datm_mom6_cice5_2d_gefs
Checking test 004 cpld_datm_mom6_cice5_2d_gefs results ....
Comparing RESTART/MOM.res.nc .........OK
Comparing RESTART/MOM.res_1.nc .........OK
Expand All @@ -73,9 +86,12 @@ Checking test 004 cpld_datm_mom6_cice5_2d_gefs results ....
Comparing mediator_FBaccumAtm_restart.nc .........OK
Comparing mediator_FBaccumIce_restart.nc .........OK
Comparing mediator_FBaccumOcn_restart.nc .........OK
Comparing mediator_FBHyd_h_restart.nc .........OK
Comparing mediator_FBLnd_l_restart.nc .........OK
Comparing mediator_FBaccumHyd_restart.nc .........OK
Comparing mediator_FBaccumLnd_restart.nc .........OK
Comparing mediator_scalars_restart.txt .........OK
Test 004 cpld_datm_mom6_cice5_2d_gefs PASS


REGRESSION TEST WAS SUCCESSFUL
Fri Jun 12 13:40:52 CDT 2020
Elapsed time: 00h:52m:46s. Have a nice day!
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ done
if [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/develop-20200210/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/DATM-MOM6-CICE5/develop-20200518}
RTPWD=${RTPWD:-$DISKNM/DATM-MOM6-CICE5/develop-20200629}
fi

shift $((OPTIND-1))
Expand Down