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

Ufs weather model for pr #606

Merged
merged 44 commits into from
Jul 14, 2021
Merged

Ufs weather model for pr #606

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
71f990a
updating .gitmodules to point to my FV3 branch
SMoorthi-emc May 27, 2021
6721536
after updating fv3atm and sumodule syncing
SMoorthi-emc May 27, 2021
d363408
after merging with ufs-seather-model/develop on May 28, 2021
SMoorthi-emc May 28, 2021
8eb1234
removing ncld from .IN files in parm
SMoorthi-emc Jun 2, 2021
7bb64d2
reinsatating original rt.conf
SMoorthi-emc Jun 2, 2021
4bdfb0c
adding module purge to compile.sh
SMoorthi-emc Jun 2, 2021
9c801f5
after updating fv3atm and ccpp-physics fix some issues with fractiona…
SMoorthi-emc Jun 8, 2021
dbb4248
reverting NEMS back to NOAA/EMC/NEMS/develop
SMoorthi-emc Jun 8, 2021
083e3bf
after mergin with ufs-weather-model/develop on June 08, 2021
SMoorthi-emc Jun 8, 2021
92abed3
after merging with ufs-weather/develop on June 10, 2021
SMoorthi-emc Jun 10, 2021
bf7e7ad
Merge remote-tracking branch 'upstream/develop' into ufs-weather-mode…
SMoorthi-emc Jun 11, 2021
3339116
after merging with ufs-weather-model/develop on June 14, 2021
SMoorthi-emc Jun 14, 2021
a4d5b87
after mergnig with ufs/develop on June 16, 2021
SMoorthi-emc Jun 16, 2021
22a4136
fixing some post files
SMoorthi-emc Jun 21, 2021
9a01352
removing gfdlmp.nml.IN
SMoorthi-emc Jun 21, 2021
b0f7de4
after merging with ufs/develop on Jun21, 2021
SMoorthi-emc Jun 21, 2021
3ed2906
restoring gsd.nml.IN
SMoorthi-emc Jun 21, 2021
bde9ee6
after submodule sync
SMoorthi-emc Jun 22, 2021
5522aef
updating some .IN files to remove ncld
SMoorthi-emc Jun 22, 2021
8e225a6
commenting cpld_ca in rt.conf
SMoorthi-emc Jun 23, 2021
fb7f4f9
setting WW3 back to 097bbb6
SMoorthi-emc Jun 23, 2021
11825e8
fixing control_ras and some other fixes
SMoorthi-emc Jun 25, 2021
a7adc40
reverting run_test.sh
SMoorthi-emc Jun 30, 2021
da34d15
some updated tests
SMoorthi-emc Jul 2, 2021
2edd0f6
after merging with ufs-weather-model/develop on July 01, 2021
SMoorthi-emc Jul 2, 2021
562e865
committing reg test log
SMoorthi-emc Jul 8, 2021
b5a7960
after merging with ufs-weather-model/develop
SMoorthi-emc Jul 8, 2021
7ce1930
removing line RAP=true from fv3_rap
SMoorthi-emc Jul 8, 2021
53f0140
rmoving module purge from compile.sh
SMoorthi-emc Jul 8, 2021
49e97e8
moving purge in compile.sh inside MACHINE_ID=wcoss-dell_p3 if loop
SMoorthi-emc Jul 12, 2021
e6397cc
after merging with ufs-weather-model/develop
SMoorthi-emc Jul 12, 2021
348d08b
updating BL_DATE to 20210712 in rt.sh
SMoorthi-emc Jul 12, 2021
e406cb8
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
c9e4559
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
8f80265
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
7b146df
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
2f0761a
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
020ce62
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
b8d7ab7
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Jul 13, 2021
fe7951d
changing compile.sh per Jun's suggestion
SMoorthi-emc Jul 13, 2021
ebf6729
Merge branch 'ufs-weather-model_for_PR' of https://github.com/SMoorth…
SMoorthi-emc Jul 13, 2021
d14ffac
removing {} around PATHTR in compile.sh
SMoorthi-emc Jul 13, 2021
12e6364
adding cray and dell log files
SMoorthi-emc Jul 13, 2021
b7da8af
updating FV3 poiner to NOAA-EMC/develop
SMoorthi-emc Jul 14, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/SMoorthi-emc/fv3atm
branch = SM_May182021
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 23 files
+2 −2 .gitmodules
+43 −30 atmos_model.F90
+73 −70 ccpp/data/GFS_typedefs.F90
+23 −37 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+0 −1 ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+91 −0 ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst_flake.xml
+0 −1 ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_ras.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15plusras.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v17_cpldnsstras.xml
+95 −0 ccpp/suites/suite_FV3_GFS_v17_cpldnsstras_flake.xml
+91 −0 ccpp/suites/suite_FV3_GFS_v17_cpldnsstrasnoshal.xml
+95 −0 ccpp/suites/suite_FV3_GFS_v17_cpldnsstsas.xml
+93 −0 ccpp/suites/suite_FV3_GFS_v17_ras.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v17_ras_flake.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v17_sas.xml
+261 −182 io/FV3GFS_io.F90
+136 −134 stochastic_physics/stochastic_physics_wrapper.F90
2 changes: 2 additions & 0 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ if [[ $MACHINE_ID == cheyenne.* ]] ; then
BUILD_JOBS=${BUILD_JOBS:-3}
elif [[ $MACHINE_ID == wcoss_dell_p3 ]] ; then
BUILD_JOBS=${BUILD_JOBS:-1}
. $MODULESHOME/init/sh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really not sure why this is needed, since the logic in NEMS/src/conf/module-setup.* is:

else if ( { test -L /usrx && sh -c "readlink /usrx 2> /dev/null | grep dell" } ) then
    # We are on WCOSS Mars or Venus
    if ( ! { module help >& /dev/null } ) then
        source /usrx/local/prod/lmod/lmod/init/$__ms_shell
    endif
    module purge

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest changing these two lines to:
source ${PATHTR}/NEMS/src/conf/module-setup.sh.inc

module purge
fi

BUILD_JOBS=${BUILD_JOBS:-8}
Expand Down
4 changes: 3 additions & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,9 @@ export IMFSHALCNV=2
export HWRF_SAMFSHAL=.F.
export IMFDEEPCNV=2
export HWRF_SAMFDEEP=.F.
export RAS=.F.
export RAS=.false.
export RANDOM_CLDS=.false.
export CNVCLD=.true.

# Aerosol convective scavenging
export FSCAV_AERO="'*:0.0'"
Expand Down
1 change: 0 additions & 1 deletion tests/parm/c96_HAFS_v0_hwrf.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = @[IMP_PHYSICS]
spec_adv = .true. ! HWRF F-A
RHGRD = 0.98 ! HWRF F-A
Expand Down
10 changes: 5 additions & 5 deletions tests/parm/control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand All @@ -138,11 +137,12 @@ deflate_level=1
satmedmf = .true.
isatmedmf = 1
lheatstrg = @[LHEATSTRG]
random_clds = .false.
random_clds = @[RANDOM_CLDS]
trans_trac = .true.
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
cnvcld = @[CNVCLD]
imfshalcnv = @[IMFSHALCNV]
imfdeepcnv = @[IMFDEEPCNV]
ras = @[RAS]
cdmbgwd = @[CDMBWD]
prslrd0 = 0.
ivegsrc = 1
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_ca.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_csawmg.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ deflate_level=1
use_ufo = .true.
pre_rad = .false.
crtrh = 0.93,0.90,0.95
ncld = 2
imp_physics = 10
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_flake.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_gdas.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ deflate_level=1
fhcyc = 1
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_noahmp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_thompson.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = @[IMP_PHYSICS]
ltaerosol = @[LTAEROSOL]
lradar = @[LRADAR]
Expand Down
1 change: 0 additions & 1 deletion tests/parm/control_ugwpv1.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deflate_level=1
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/cpt.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
use_ufo = .true.
pre_rad = .false.
crtrh = 0.93,0.90,0.95
ncld = 2
imp_physics = 10
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/csawmg3shoc127.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
use_ufo = .true.
pre_rad = .false.
crtrh = 0.98,0.98,0.90
ncld = 2
imp_physics = 10
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/csawmgshoc.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
use_ufo = .true.
pre_rad = .false.
crtrh = 1.00,1.00,0.95
ncld = 2
imp_physics = 10
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/esg_HAFS_v0_hwrf.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = @[IMP_PHYSICS]
spec_adv = .true. ! HWRF F-A
RHGRD = 0.98 ! HWRF F-A
Expand Down
1 change: 0 additions & 1 deletion tests/parm/gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = @[IMP_PHYSICS]
ltaerosol = @[LTAEROSOL]
lradar = @[LRADAR]
Expand Down
1 change: 0 additions & 1 deletion tests/parm/gsd_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = @[IMP_PHYSICS]
ltaerosol = @[LTAEROSOL]
lradar = @[LRADAR]
Expand Down
1 change: 0 additions & 1 deletion tests/parm/gsd_sar.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 8
! ttendlim = 0.005
ttendlim = 50.0
Expand Down
1 change: 0 additions & 1 deletion tests/parm/input.benchmark_v16.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
fhcyc = 24
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/input.mom6_ccpp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 1
imp_physics = 99
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/input_nest02.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/multi_gases.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 1
imp_physics = 99
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/regional.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 8
ltaerosol = .F.
ttendlim = -999.0
Expand Down
1 change: 0 additions & 1 deletion tests/parm/regional_c768.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/regional_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 8
ltaerosol = .F.
ttendlim = -999.0
Expand Down
1 change: 0 additions & 1 deletion tests/parm/stretched-input.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
1 change: 0 additions & 1 deletion tests/parm/stretched-nest-input.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
nst_anl = .true.
use_ufo = .true.
pre_rad = .false.
ncld = 5
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_2017_coupled,FV3_GFS_v15p2_coupled,FV3

RUN | cpld_control | - wcoss_cray | fv3 |
RUN | cpld_restart | - wcoss_cray | | cpld_control
#RUN | cpld_2threads | - wcoss_cray | |
RUN | cpld_2threads | - wcoss_cray | |
RUN | cpld_decomp | - wcoss_cray jet.intel | |
RUN | cpld_ca | - wcoss_cray | fv3 |

Expand Down
4 changes: 3 additions & 1 deletion tests/tests/control_ras
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ export SDAY=22
export SHOUR=06
export OUTPUT_GRID='gaussian_grid'
export NSTF_NAME='2,0,0,0,0'
export WRITE_DOPOST=.true.
export WRITE_DOPOST=.T.
export IAER=5111

export RAS=.T.
export IMFDEEPCNV=-1
export CNVCLD=.F.
export RANDOM_CLDS=.T.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16_ras
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/control_ras_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export IAER=5111

export RAS=.T.
export IMFDEEPCNV=-1
export CNVCLD=.F.
export RANDOM_CLDS=.T.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16_ras
Expand Down