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.

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

update to current ufs-weather-app #19

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ae4051d
Merge pull request #1 from ufs-community/develop
DeniseWorthen Nov 20, 2019
6c0ea1d
Update .gitmodules
DeniseWorthen Nov 22, 2019
e72146c
update submodules for nems,stochastic_physics
DeniseWorthen Nov 22, 2019
190d88f
update NEMS,stochastic_physics
DeniseWorthen Nov 23, 2019
b9c578e
Merge pull request #2 from ufs-community/develop
DeniseWorthen Nov 27, 2019
0c8cb0b
update CICE submode for feature/halfdeg (with build change) and
DeniseWorthen Dec 2, 2019
fd535ff
Merge pull request #3 from ufs-community/develop
DeniseWorthen Dec 6, 2019
040d027
Revert "update CICE submode for feature/halfdeg (with build change) and"
DeniseWorthen Dec 6, 2019
6d15ca7
update CICE submodule
DeniseWorthen Dec 6, 2019
7bf2632
update develop branch in my fork to use NOAA-EMC develop branches
DeniseWorthen Dec 12, 2019
9d2b7a3
Merge pull request #5 from ufs-community/develop
DeniseWorthen Jan 1, 2020
d391b7c
Merge pull request #6 from ufs-community/develop
DeniseWorthen Jan 16, 2020
bf4bbce
Update configure.fv3_coupled.hera.intel
DeniseWorthen Jan 20, 2020
7809696
Update configure.fv3_coupled.cheyenne.intel
DeniseWorthen Jan 20, 2020
1e9a090
update conf,parm and modulefiles to current ufs-weather-model
DeniseWorthen Jan 21, 2020
6a9bf46
Merge pull request #7 from ufs-community/develop
DeniseWorthen Jan 21, 2020
6555c52
Merge branch 'develop' into feature/up2ufs_weather
DeniseWorthen Jan 21, 2020
6726bf7
Update configure.fv3_coupled.cheyenne.intel
DeniseWorthen Jan 21, 2020
ea5890c
Update configure.fv3_coupled.hera.intel
DeniseWorthen Jan 21, 2020
04f8bb4
add hera logs
DeniseWorthen Jan 22, 2020
526ca4c
add hera logs
DeniseWorthen Jan 22, 2020
5cdfdd3
update FV3
DeniseWorthen Jan 23, 2020
acab829
update stochastic_physics submodule
DeniseWorthen Jan 23, 2020
e54aa58
update FMS to tag 2019.01 from GFDL repo
DeniseWorthen Jan 23, 2020
655c41b
add hera logs; all tests pass
DeniseWorthen Jan 23, 2020
a4119c0
revert to previous FMS to enable compiler support on phase2
DeniseWorthen Jan 23, 2020
4285243
hera logs w/ FMS reverted to GFS-FMS
DeniseWorthen Jan 23, 2020
a8ac066
add wcoss-phase2 logs
DeniseWorthen Jan 23, 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
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 64 files
+1 −0 .gitignore
+130 −0 CMakeLists.txt
+1 −1 atmos_cubed_sphere
+28 −6 atmos_model.F90
+28 −15 ccpp/CMakeLists.txt
+1 −1 ccpp/build_ccpp.sh
+20 −1 ccpp/config/ccpp_prebuild_config.py
+27 −0 ccpp/driver/CMakeLists.txt
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017.xml
+88 −0 ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −2 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −0 ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+93 −0 ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+89 −0 ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1 ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −0 ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15plus.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v16beta.xml
+83 −0 ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −0 ccpp/suites/suite_FV3_GSD_noah.xml
+1 −0 ccpp/suites/suite_FV3_GSD_v0.xml
+2 −2 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+87 −0 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+12 −0 cpl/CMakeLists.txt
+12 −6 fv3_cap.F90
+228 −0 gfsphysics/CMakeLists.txt
+13 −0 gfsphysics/GFS_layer/GFS_diagnostics.F90
+62 −10 gfsphysics/GFS_layer/GFS_driver.F90
+385 −113 gfsphysics/GFS_layer/GFS_physics_driver.F90
+55 −14 gfsphysics/GFS_layer/GFS_radiation_driver.F90
+5 −5 gfsphysics/GFS_layer/GFS_restart.F90
+252 −71 gfsphysics/GFS_layer/GFS_typedefs.F90
+290 −89 gfsphysics/GFS_layer/GFS_typedefs.meta
+1 −0 gfsphysics/physics/sflx.f
+6 −4 gfsphysics/physics/ugwp_driver_v0.f
+33 −0 io/CMakeLists.txt
+46 −13 io/FV3GFS_io.F90
+67 −14 io/post_gfs.F90
+26 −0 ipd/CMakeLists.txt
+4 −4 makefile
+74 −35 module_fcst_grid_comp.F90
+4 −3 module_fv3_config.F90
+107 −0 namphysics/CMakeLists.txt
+56 −0 stochastic_physics/CMakeLists.txt
3 changes: 3 additions & 0 deletions compsets/fv3.input
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,10 @@ fv3_defaults = {
MAKE_NH='.T.'
MOUNTAIN='.F.'
SATMEDMF='.F.'
ISATMEDMF='0'
HYBEDMF='.T.'
IMFSHALCNV='2'
IMFDEEPCNV='2'
LHEATSTRG='.F.'
LGFDLMPRAD='.F.'
EFFR_IN='.F.'
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_phase2
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte

CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST

ifeq ($(HYDRO),Y)
CPPDEFS +=
Expand Down
2 changes: 1 addition & 1 deletion conf/configure.fv3_coupled.wcoss_phase2
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte

CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST

ifeq ($(HYDRO),Y)
CPPDEFS +=
Expand Down
2,389 changes: 2,245 additions & 144 deletions log/report-hera.intel-log/build_fv3_mom6_cice.exe.log

Large diffs are not rendered by default.

69 changes: 33 additions & 36 deletions log/report-hera.intel-log/rtreport.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,45 @@
Run rocotostat...
Generate report...
WORKFLOW STARTED AT Tue Jan 21 18:44:16 2020 (+1579632256)
WORKFLOW STARTED AT Thu Jan 23 19:25:53 2020 (+1579807553)
Repository information:


REPO TOP:
develop 478b092 [origin/develop] Debug mode capablility (#15)
Fetch URL: https://github.com/MinsukJi-NOAA/ufs-s2s-model
M CICE_SRC
M MOM6
M NEMS
develop 6a9bf46 [origin/develop] Merge pull request #7 from ufs-community/develop
Fetch URL: git@github.com:DeniseWorthen/ufs-s2s-model.git
M log/report-hera.intel-log/build_fv3_mom6_cice.exe.log
M log/report-hera.intel-log/rtreport.txt

Entering 'CICE_SRC'
develop aafac32 [origin/develop] Code changes to support automatic debug compilation (#10)
(HEAD detached at aafac32) aafac32 Code changes to support automatic debug compilation (#10)
Fetch URL: https://github.com/NOAA-EMC/CICE5.git

Entering 'FMS'
(HEAD detached at 46014b4) 46014b4 Merge pull request #8 from DusanJovic-NOAA/GFS-FMS
Fetch URL: https://github.com/NOAA-EMC/FMS

Entering 'FV3'
(HEAD detached at 26de321) 26de321 change ifmin to zero at fh00 for inline POST (#14)
(HEAD detached at b1ddd67) b1ddd67 Update EMC dev/emc from NCAR dtc/develop 2019/12/17 (#30)
Fetch URL: https://github.com/NOAA-EMC/fv3atm

Entering 'MOM6'
develop 575f570 [origin/develop] Code change to compile.sh enables the following: DEBUG flag is passed down as an environment variable. Subsequently, DEBUG or REPRO is automatically selected.
(HEAD detached at 575f570) 575f570 Code change to compile.sh enables the following: DEBUG flag is passed down as an environment variable. Subsequently, DEBUG or REPRO is automatically selected.
Fetch URL: https://github.com/NOAA-EMC/MOM6-interface

Entering 'NEMS'
develop daae388 [origin/develop] Code changes to support DEBUG compilation based on appBuilder specification (#23)
(HEAD detached at daae388) daae388 Code changes to support DEBUG compilation based on appBuilder specification (#23)
Fetch URL: https://github.com/NOAA-EMC/NEMS.git

Entering 'stochastic_physics'
(HEAD detached at 231e5b7) 231e5b7 Merge pull request #3 from climbfuji/fix_nonexistent_include_dir_warning
(HEAD detached at 1745422) 1745422 Merge pull request #6 from noaa-psd/psd/develop
Fetch URL: https://github.com/noaa-psd/stochastic_physics


BUILD fv3_mom6_cice.exe: SUCCEEDED

TEST #1: PASS
Test cpld_fv3_384_mom6_cice_2d_atm_flux starting at Tue Jan 21 18:46:35 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
Tue Jan 21 18:46:35 UTC 2020
Test cpld_fv3_384_mom6_cice_2d_atm_flux starting at Thu Jan 23 19:44:34 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
Thu Jan 23 19:44:34 UTC 2020
phyf048.tile1.nc: bit-for-bit identical
phyf048.tile2.nc: bit-for-bit identical
phyf048.tile3.nc: bit-for-bit identical
Expand Down Expand Up @@ -115,14 +112,14 @@ TEST #1: PASS
mediator_FBHyd_h_restart.nc: bit-for-bit identical
mediator_FBAtmOcn_o_restart.nc: bit-for-bit identical
Executable did not change during test suite:
File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
TEST PASSED AT Tue Jan 21 19:31:26 UTC 2020
File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.365551/exec/fv3_mom6_cice.exe
Expected md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
Actual md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
TEST PASSED AT Thu Jan 23 20:30:29 UTC 2020

TEST #2: PASS
Test cpld_fv3_384_mom6_cice_cold_atm_flux starting at Tue Jan 21 18:46:45 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold 384)
Tue Jan 21 18:46:45 UTC 2020
Test cpld_fv3_384_mom6_cice_cold_atm_flux starting at Thu Jan 23 19:44:41 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold 384)
Thu Jan 23 19:44:41 UTC 2020
phyf001.tile1.nc: bit-for-bit identical
phyf001.tile2.nc: bit-for-bit identical
phyf001.tile3.nc: bit-for-bit identical
Expand Down Expand Up @@ -178,14 +175,14 @@ TEST #2: PASS
mediator_FBOcn_o_restart.nc: bit-for-bit identical
mediator_scalars_restart.txt: bit-for-bit identical
Executable did not change during test suite:
File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
TEST PASSED AT Tue Jan 21 18:51:59 UTC 2020
File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.365551/exec/fv3_mom6_cice.exe
Expected md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
Actual md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
TEST PASSED AT Thu Jan 23 19:50:16 UTC 2020

TEST #3: PASS
Test cpld_fv3_mom6_cice_cold_atm_flux starting at Tue Jan 21 18:47:44 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold start)
Tue Jan 21 18:47:44 UTC 2020
Test cpld_fv3_mom6_cice_cold_atm_flux starting at Thu Jan 23 19:44:51 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold start)
Thu Jan 23 19:44:51 UTC 2020
phyf001.tile1.nc: bit-for-bit identical
phyf001.tile2.nc: bit-for-bit identical
phyf001.tile3.nc: bit-for-bit identical
Expand Down Expand Up @@ -241,14 +238,14 @@ TEST #3: PASS
mediator_FBOcn_o_restart.nc: bit-for-bit identical
mediator_scalars_restart.txt: bit-for-bit identical
Executable did not change during test suite:
File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
TEST PASSED AT Tue Jan 21 18:50:23 UTC 2020
File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.365551/exec/fv3_mom6_cice.exe
Expected md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
Actual md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
TEST PASSED AT Thu Jan 23 19:47:49 UTC 2020

TEST #4: PASS
Test cpld_fv3_mom6_cice_2d_atm_flux starting at Tue Jan 21 18:47:40 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
Tue Jan 21 18:47:40 UTC 2020
Test cpld_fv3_mom6_cice_2d_atm_flux starting at Thu Jan 23 19:45:19 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
Thu Jan 23 19:45:19 UTC 2020
phyf048.tile1.nc: bit-for-bit identical
phyf048.tile2.nc: bit-for-bit identical
phyf048.tile3.nc: bit-for-bit identical
Expand Down Expand Up @@ -321,11 +318,11 @@ TEST #4: PASS
mediator_FBHyd_h_restart.nc: bit-for-bit identical
mediator_FBAtmOcn_o_restart.nc: bit-for-bit identical
Executable did not change during test suite:
File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
TEST PASSED AT Tue Jan 21 19:14:38 UTC 2020
WORKFLOW REPORT AT Tue Jan 21 19:32:58 2020 (+1579635178)
File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.365551/exec/fv3_mom6_cice.exe
Expected md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
Actual md5sum: d3522f375e2dc0b4bc54c8f1db83bdfa
TEST PASSED AT Thu Jan 23 20:12:13 UTC 2020
WORKFLOW REPORT AT Thu Jan 23 20:31:05 2020 (+1579811465)
Tests: 0 failed, 4 passed out of 4
Builds: 0 failed, 1 passed out of 1
REGRESSION TEST WAS SUCCESSFUL
Loading