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

ufs/dev "omnibus" changes from 11/2024-02/2025 #1109

Merged
merged 236 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
236 commits
Select commit Hold shift + click to select a range
3b41b8a
Thompson refactor
AndersJensen-NOAA Dec 7, 2023
a3e0d45
Missing intentation
AndersJensen-NOAA Dec 13, 2023
10a17a9
Final formatted and CCN table sngl_prec
AndersJensen-NOAA Dec 14, 2023
e2d6c1e
Merge branch 'ufs-community:ufs/dev' into thompson_refactor
AndersJensen-NOAA Dec 15, 2023
72370a4
Changes from review 1
AndersJensen-NOAA Dec 21, 2023
dd3040f
Shorten kind type notation
AndersJensen-NOAA Dec 21, 2023
dcf6422
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
AndersJensen-NOAA Jan 22, 2024
f2ea60d
Fixes to precision
AndersJensen-NOAA Jan 26, 2024
5ed21c4
"MYNN, GF, RUC LSM and smoke plumerise updates for RRFSv1 code freeze"
haiqinli Feb 23, 2024
92888a1
"Move the suppressing of weak radar reflectvity over water into GF, a…
haiqinli Feb 26, 2024
9a5588c
changes to work with always-allocated variables
grantfirl Feb 27, 2024
9cd8d82
"update to address code reviewer's comments"
haiqinli Feb 27, 2024
61ef1d9
Merge branch 'thompson_refactor' into thompson_refactor_RRFS
grantfirl Feb 28, 2024
716abb6
use physical constants from host for Thompson MP
grantfirl Feb 24, 2024
8718420
change parameters to variables in module_mp_thompson_make_number_conc…
grantfirl Feb 27, 2024
8a4b102
Merge pull request #176 from haiqinli/production/RRFS.v1-codefreeze
climbfuji Mar 1, 2024
9e49be5
Merge branch 'production/RRFS.v1' into feature/fix_check_all_zero_all…
grantfirl Mar 1, 2024
09c7674
Merge branch 'production/RRFS.v1' into thompson_refactor_RRFS
grantfirl Mar 1, 2024
730ad5a
Merge pull request #178 from grantfirl/feature/fix_check_all_zero_all…
grantfirl Mar 5, 2024
4354b24
Merge branch 'production/RRFS.v1' into thompson_refactor_RRFS
grantfirl Mar 5, 2024
9fba7ff
land iau init
tsga Mar 16, 2024
bc810b4
mv iau forcing read to noahmpdrv_timestep_init
tsga Mar 17, 2024
a631c9d
Merge branch 'ufs-community:ufs/dev' into feature/lnd_iau
tsga Mar 18, 2024
fcbfb5c
add land iau as noahmpdrv_time_vary module
tsga Mar 19, 2024
85a54eb
Merge branch 'feature/lnd_iau' of https://github.com/tsga/ccpp-physic…
tsga Mar 19, 2024
2b576f0
revert to using noahmpdrv_timestep_init
Mar 24, 2024
d61f9dc
read all increment files at _init time
Mar 24, 2024
c0b760e
debug
tsga Apr 10, 2024
43c83a3
Merge branch 'ufs-community:ufs/dev' into feature/lnd_iau
tsga Apr 10, 2024
3afbaa2
deallocate at noahmpdrv_finalize
Apr 18, 2024
8a8b17b
comment nc mod
Apr 18, 2024
661c557
Merge branch 'ufs-community:ufs/dev' into feature/lnd_iau
tsga May 22, 2024
9d9036f
mv config up
tsga May 22, 2024
f04a01d
delte _time_vary mods
tsga May 22, 2024
f8b96b5
add nc90 funcs, cleanup, add comments
May 25, 2024
e535c80
add soil temp adjustments
May 31, 2024
25358b9
read fv3 increments
Jun 13, 2024
df9f640
update driver_timestepinit
Jun 17, 2024
ea2f78b
remove duplicte names
Jun 17, 2024
4737da1
remove duplicte names
Jun 17, 2024
bb042f3
remove duplicte names
Jun 17, 2024
2975f64
fix arg_table_noahmpdrv_finalize
tsga Jun 17, 2024
b8883bd
Merge branch 'tmp' into feature/lnd_iau
tsga Jun 17, 2024
d009364
debug
Jun 17, 2024
ae68068
fix error about horizontal dimention
Jun 18, 2024
04e246d
fix error about horizontal dimention
Jun 18, 2024
264eaf3
fix netcdf error
Jun 18, 2024
fb21cc0
fix netcdf error
Jun 18, 2024
9675dc8
fix smc adjustment error
Jun 18, 2024
619fbc5
fix smc adjustment error
Jun 18, 2024
bc0e3ea
fix namelist typo
Jun 19, 2024
7208087
fix netcdf dim error
Jun 19, 2024
c5e52dd
fix netcdf dim error
Jun 19, 2024
08c49a6
remove Gaussian files
Jun 20, 2024
bb02763
remove Gaussian files
Jun 20, 2024
651fb26
remove Gaussian files
Jun 20, 2024
e3c9687
debug memory
Jun 20, 2024
c306628
fix fv3 file error
Jun 21, 2024
9a94c57
fix fv3 file error
Jun 21, 2024
f5de22f
fix fv3 file error
Jun 21, 2024
98d872b
add land iau conditions
Jun 22, 2024
f59bf59
add land iau conditions
Jun 22, 2024
f40cebc
add land iau conditions
Jun 22, 2024
efad815
temp comment soilt consistency
Jun 22, 2024
1537ef1
temp comment soilt consistency
Jun 22, 2024
e1dae93
temp comment soilt consistency
Jun 22, 2024
d01adf6
temp comment soilt consistency
Jun 22, 2024
e7bb2c3
temp comment soilt consistency
Jun 22, 2024
3fe39b7
fix rdt error
Jun 23, 2024
ed09ad6
-
Jun 23, 2024
0c8ff8e
-
Jun 23, 2024
3656ec5
-
Jun 23, 2024
b744d6c
-
Jun 23, 2024
dbe2d7d
-
Jun 23, 2024
05de695
debug
Jun 23, 2024
820ef5e
clean up
Jun 23, 2024
b46a17f
read mask from file
Jun 24, 2024
3bb397a
revert back to calculating mask
Jun 24, 2024
10c3427
delete sim_nc
Jun 26, 2024
e814940
use explcit array length
Jul 11, 2024
18c769c
use explcit array length
Jul 11, 2024
7644d55
debug print
Jul 11, 2024
77ed427
read land snow mask from inc files
Jul 14, 2024
4590b5d
read land snow mask from inc files
Jul 14, 2024
562e6d3
read land snow mask from inc files
Jul 14, 2024
1a936bb
test on adj
Jul 14, 2024
f53c9ab
print debug info
Jul 15, 2024
e6b68c7
print debug info
Jul 15, 2024
c575a42
print debug info
Jul 15, 2024
ca26670
restrore stc/slc adjustments
Jul 15, 2024
2c0c276
print diff indices
Jul 16, 2024
119ebbd
bypass _timestep_init
Jul 18, 2024
9bfc305
bypass _timestep_init
Jul 18, 2024
3234712
test with hardcoded inc
Jul 19, 2024
432015d
test with hardcoded inc
Jul 19, 2024
62fd97c
test with hardcoded inc
Jul 19, 2024
6c2ac76
test with hardcoded inc
Jul 20, 2024
bde3e05
test with hardcoded inc
Jul 20, 2024
ff3660f
test non-iau increment hardcoded
Jul 21, 2024
6f18f65
test 0 inc double prec
Jul 23, 2024
7c4806b
remove hard-coded test
Jul 24, 2024
29cff05
remove debug prints
Jul 24, 2024
6530674
add stc update and adjustment
Jul 31, 2024
0b41c39
add stc update and adjustment
Jul 31, 2024
0de64dd
zero out too small increments
Aug 5, 2024
a6381f3
zero out too small increments
Aug 6, 2024
4a953f3
add comment for single increment
Aug 8, 2024
7319bad
include t2 in update iau call
Aug 8, 2024
f5607ad
set hr6 the only incr file (for testing)
Aug 10, 2024
d0c2cac
add increments at timestep_finalize (for testing)
Aug 14, 2024
b79c7e6
add sec argtable
Aug 14, 2024
4398a95
fix argtable
Aug 15, 2024
4d244ea
input line in namelist for stcsmc adjustment
Aug 16, 2024
1cbaea4
clean up
Aug 20, 2024
812aefb
fix missing error code initialization
Aug 28, 2024
1af8251
Merge branch 'ufs-community:ufs/dev' into feature/lnd_iau
tsga Sep 3, 2024
9b3dccd
remove namelist filename from iau struct
tsga Sep 4, 2024
10e1434
use defaults when lnd_iau_nml doesn't exist
tsga Sep 13, 2024
105eca1
Update noahmpdrv.F90
tsga Sep 23, 2024
b4f0ba9
Update noahmpdrv.meta
tsga Sep 23, 2024
d2f9be1
Update noahmpdrv.F90
tsga Sep 23, 2024
6609eac
Update lnd_iau_mod.F90
tsga Sep 23, 2024
dbd3eb4
Update lnd_iau_mod.F90
tsga Sep 23, 2024
3c4fc1a
Update noahmpdrv.F90
tsga Sep 23, 2024
335141f
Update lnd_iau_mod.F90
tsga Sep 26, 2024
77714c4
Update noahmpdrv.F90
tsga Oct 2, 2024
28cf85f
Update noahmpdrv.F90
tsga Oct 2, 2024
156fb4e
Update noahmpdrv.meta
tsga Oct 2, 2024
bfbb35d
Update noahmpdrv.meta
tsga Oct 2, 2024
b4bb1fc
Merge branch 'ufs/dev' into feature/lnd_iau_gjf
grantfirl Oct 8, 2024
7188fc8
move declaration of land_iau_mod DDT instances from CCPP physics to h…
grantfirl Oct 9, 2024
bf3e1e1
add metadata for land IAU types
grantfirl Oct 9, 2024
4782f68
fix compilation errors
grantfirl Oct 9, 2024
e07ba94
Merge pull request #1 from grantfirl/feature/lnd_iau_gjf
tsga Oct 10, 2024
6e3bc2f
set land_iau_control from host
Oct 15, 2024
1a67785
calculate snowsoil mask at runtime
Oct 16, 2024
c58be12
combine DDTs holding increments; get rid of scheme level global array
Oct 16, 2024
590bb80
modify subroutines set/update increments
Oct 16, 2024
e98f8d8
default weight factors
Oct 17, 2024
89a1d0b
move weight factors to _IAU_Data
Oct 17, 2024
fa3591e
update noahmpdrv meta
Oct 17, 2024
a9c44e6
fix time interval bounds
Oct 20, 2024
28dc544
handle valid time range better
Oct 20, 2024
7cac448
minor edit
Oct 20, 2024
2097bd0
do netcdf error handling inside get_var3d_values
Oct 21, 2024
403312a
error handling for read_iau_forcing_fv3
Oct 21, 2024
df8ed48
remove redeclared constants in _timestep_int
Oct 21, 2024
4c78f46
fix compilation errors
Oct 21, 2024
88c9df5
Merge branch 'thompson_refactor_RRFS' into rrfsv1-to-ufs/dev3
grantfirl Oct 28, 2024
f25bf2d
clean up, remove debug print outs
Oct 29, 2024
941323b
restore if (cpllnd .and. cpllnd2atm) check
tsga Oct 29, 2024
753676c
clean noahmpdrv
Oct 29, 2024
769a509
Merge branch 'feature/lnd_iau' of https://github.com/tsga/ccpp-physic…
Oct 29, 2024
ee1b463
remove debug prints
Oct 29, 2024
228c550
"Update MYNN PBL for RRFS.v1"
haiqinli Mar 5, 2024
728ecf1
"smoke updates for RRFS.v1"
haiqinli Mar 13, 2024
5048dbb
"update to address UFS reviewer's comments"
haiqinli Mar 13, 2024
dac2f23
"merge physics PR #186 from Jili"
haiqinli Mar 14, 2024
5d1a4aa
Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospe…
jordanschnell Mar 28, 2024
84cddc3
Update noahmpdrv.F90
tsga Oct 30, 2024
e428689
Update noahmpdrv.F90
tsga Oct 30, 2024
cd03ce7
Update noahmpdrv.F90
tsga Oct 30, 2024
1442fdb
Update noahmpdrv.F90
tsga Oct 30, 2024
9b88ec3
Update noahmpdrv.F90
tsga Oct 30, 2024
3672889
Update noahmpdrv.F90
tsga Oct 30, 2024
a61f437
Update noahmpdrv.F90
tsga Oct 30, 2024
71ab425
Update noahmpdrv.F90
tsga Oct 30, 2024
ec2a299
Update noahmpdrv.F90
tsga Oct 30, 2024
1391585
change DDTs in noahmpdrv_init to optional
Oct 30, 2024
b008e25
update noahmpdrv.meta for edits to accomodate component model NoahMP
Oct 30, 2024
ebb7b6b
fix compile error
Oct 30, 2024
3b683ad
Merge branch 'ufs-community:ufs/dev' into feature/lnd_iau
tsga Oct 30, 2024
db2c10f
fix real type for mask
tsga Oct 31, 2024
41527dd
skip land component for first time step
uturuncoglu Nov 8, 2024
002a886
Merge pull request #228 from grantfirl/rrfsv1-to-ufs/dev2
rhaesung Nov 8, 2024
0797b1a
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev3
grantfirl Nov 8, 2024
cf1bb8d
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev4
grantfirl Nov 8, 2024
ebc3fb3
add optional to two variables in rrfs_smoke_wrapper
grantfirl Nov 9, 2024
eac6b9a
Merge branch 'ufs/dev' into feature/lnd_iau
tsga Nov 13, 2024
4403bf8
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Nov 13, 2024
82f1ec3
add optional=True for lndiau ddts
Nov 15, 2024
13e8e78
clean lnd_iau_mod
Nov 15, 2024
b9e0429
clean noahmpdrv_timestep_init
Nov 15, 2024
4343656
combine use lnd_iau_mod lines
Nov 15, 2024
cfa1861
Merge pull request #222 from tsga/feature/lnd_iau
grantfirl Nov 18, 2024
3d47543
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev3
grantfirl Nov 21, 2024
9dffb7e
fix trailing whitespace in mp_thompson.F90
grantfirl Nov 21, 2024
6e0467a
Merge pull request #229 from grantfirl/rrfsv1-to-ufs/dev3
rhaesung Nov 25, 2024
c2fb52e
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev4
grantfirl Dec 2, 2024
c69a7c3
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Dec 2, 2024
dab57fc
Merge pull request #230 from grantfirl/rrfsv1-to-ufs/dev4
grantfirl Dec 5, 2024
66a3fea
"update deep soil temperature of RUC LSM"
haiqinli Jun 26, 2024
b7db853
"Update to scale the RAVE fire emission and duirnal cycle of agriculu…
haiqinli Jul 23, 2024
409df9b
remove comment
grantfirl Dec 5, 2024
a1d1d23
add a new parameter to control if G-F cold starts or not
JiliDong-NOAA Aug 22, 2024
7274187
minor fix for restart
uturuncoglu Dec 6, 2024
da33dbd
Merge remote-tracking branch 'upstream/ufs/dev' into feature/land
uturuncoglu Dec 6, 2024
5d7c8f1
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Dec 6, 2024
2594a9e
add back Anning's change to evaporation in Thompson when using MERRA2…
grantfirl Dec 6, 2024
2be4469
add simple land flux calculation that is used in the initial time step
uturuncoglu Dec 19, 2024
491fbc3
fix minor issue
uturuncoglu Dec 19, 2024
eab5725
Update physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.*…
climbfuji Dec 19, 2024
13f0f8d
remove flag_init
uturuncoglu Dec 23, 2024
05e017a
correction for flux calculation
uturuncoglu Dec 27, 2024
dfad42f
Merge pull request #231 from grantfirl/rrfsv1-to-ufs/dev5
grantfirl Dec 30, 2024
92f1ad0
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev7
grantfirl Dec 30, 2024
8a565e3
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev9
grantfirl Jan 2, 2025
a7fe01c
Merge pull request #236 from grantfirl/rrfsv1-to-ufs/dev7
rhaesung Jan 3, 2025
fa3f1ce
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev8
grantfirl Jan 3, 2025
38c353b
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev9
grantfirl Jan 3, 2025
4057c80
Merge remote-tracking branch 'upstream/ufs/dev' into feature/land
uturuncoglu Jan 3, 2025
1ffea26
update cloud/radiation/land
rhaesung Jan 3, 2025
80d5c40
update radiation_clouds.f according to the review
rhaesung Jan 6, 2025
24643b0
Merge pull request #237 from grantfirl/rrfsv1-to-ufs/dev8
rhaesung Jan 7, 2025
7a2d2af
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev9
grantfirl Jan 7, 2025
0dbea49
fix space issue
uturuncoglu Jan 7, 2025
0df4951
Merge remote-tracking branch 'upstream/ufs/dev' into hr5
rhaesung Jan 10, 2025
03d6fc7
Merge remote-tracking branch 'upstream/ufs/dev' into feature/land
uturuncoglu Jan 13, 2025
0b42661
Merge branch 'feature/gfs_phys_time_vary_nrl_multiinstance' into rrfs…
grantfirl Jan 13, 2025
449343f
Merge pull request #238 from grantfirl/rrfsv1-to-ufs/dev9
grantfirl Jan 16, 2025
ed3d4af
Merge remote-tracking branch 'upstream/ufs/dev' into feature/land
uturuncoglu Jan 17, 2025
7f1a1d8
update module_sf_noahmp_glacier.F90 and module_sf_noahmplsm.F90 accor…
rhaesung Jan 21, 2025
93edbe1
update module_sf_noahmplsm.F90
rhaesung Jan 22, 2025
3d828f5
update module_sf_noahmplsm.F90
rhaesung Jan 22, 2025
50a7846
Merge pull request #234 from uturuncoglu/feature/land
rhaesung Jan 28, 2025
14d5e9c
Merge remote-tracking branch 'upstream/ufs/dev' into hr5
rhaesung Jan 29, 2025
db19a6d
Merge pull request #244 from rhaesung/hr5
grantfirl Feb 3, 2025
74a0a5d
Merge branch 'feature/lnd_iau' into ufs-dev-omnibus-20250204
grantfirl Feb 4, 2025
22a9d52
Merge branch 'rrfsv1-to-ufs/dev3' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
137dea0
Merge branch 'rrfsv1-to-ufs/dev4' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
383fb3f
Merge branch 'rrfsv1-to-ufs/dev5' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
7402f6f
Merge branch 'rrfsv1-to-ufs/dev7' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
3448751
Merge branch 'rrfsv1-to-ufs/dev8' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
b80f8de
Merge branch 'rrfsv1-to-ufs/dev9' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
b65b544
Merge branch 'feature/land' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
66e9739
Merge branch 'hr5' into ufs-dev-omnibus-20250204
grantfirl Feb 5, 2025
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
6 changes: 3 additions & 3 deletions physics/CONV/Grell_Freitas/cu_gf_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ end subroutine cu_gf_driver_init
!! \htmlinclude cu_gf_driver_run.html
!!
!>\section gen_gf_driver Grell-Freitas Cumulus Scheme Driver General Algorithm
subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart, gf_coldstart, &
cactiv,cactiv_m,g,cp,xlv,r_v,forcet,forceqv_spechum,phil,raincv, &
qv_spechum,t,cld1d,us,vs,t2di,w,qv2di_spechum,p2di,psuri, &
hbot,htop,kcnv,xland,hfx2,qfx2,aod_gf,cliw,clcw, &
Expand Down Expand Up @@ -97,7 +97,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
integer :: its,ite, jts,jte, kts,kte
integer, intent(in ) :: im,km,ntracer,nchem,kdt
integer, intent(in ) :: ichoice_in,ichoicem_in,ichoice_s_in
logical, intent(in ) :: flag_init, flag_restart, do_mynnedmf
logical, intent(in ) :: flag_init, flag_restart, do_mynnedmf, gf_coldstart
logical, intent(in ) :: flag_for_scnv_generic_tend,flag_for_dcnv_generic_tend
real (kind=kind_phys), intent(in) :: g,cp,xlv,r_v
logical, intent(in ) :: ldiag3d
Expand Down Expand Up @@ -431,7 +431,7 @@ subroutine cu_gf_driver_run(ntracer,garea,im,km,dt,flag_init,flag_restart,&
ccn_m(i) = 0.

! set aod and ccn
if (flag_init .and. .not.flag_restart) then
if ((flag_init .and. .not.flag_restart) .or. gf_coldstart) then
aod_gf(i)=aodc0
else
if((cactiv(i).eq.0) .and. (cactiv_m(i).eq.0))then
Expand Down
7 changes: 7 additions & 0 deletions physics/CONV/Grell_Freitas/cu_gf_driver.meta
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,13 @@
dimensions = ()
type = logical
intent = in
[gf_coldstart]
standard_name = flag_for_cold_start_gf
long_name = flag to cold start G-F
units = flag
dimensions = ()
type = logical
intent = in
[ichoice_in]
standard_name = identifier_for_c3_or_gf_deep_convection_closure
long_name = flag for C3 or GF deep convection closure
Expand Down
5 changes: 3 additions & 2 deletions physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module cu_gf_driver_pre
!> \section arg_table_cu_gf_driver_pre_run Argument Table
!! \htmlinclude cu_gf_driver_pre_run.html
!!
subroutine cu_gf_driver_pre_run (flag_init, flag_restart, kdt, fhour, dtp, t, q, prevst, prevsq, &
subroutine cu_gf_driver_pre_run (flag_init, flag_restart, gf_coldstart, kdt, fhour, dtp, t, q, prevst, prevsq, &
forcet, forceq, cactiv, cactiv_m, conv_act, conv_act_m, &
rrfs_sd, ntsmoke, ntdust, ntcoarsepm, chem3d, gq0, &
errmsg, errflg)
Expand All @@ -27,6 +27,7 @@ subroutine cu_gf_driver_pre_run (flag_init, flag_restart, kdt, fhour, dtp, t, q,

logical, intent(in) :: flag_init
logical, intent(in) :: flag_restart
logical, intent(in) :: gf_coldstart
logical, intent(in) :: rrfs_sd
integer, intent(in) :: kdt
real(kind_phys), intent(in) :: fhour
Expand Down Expand Up @@ -60,7 +61,7 @@ subroutine cu_gf_driver_pre_run (flag_init, flag_restart, kdt, fhour, dtp, t, q,
! For restart runs, can assume that prevst and prevsq
! are read from the restart files beforehand, same
! for conv_act.
if(flag_init .and. .not.flag_restart) then
if((flag_init .and. .not.flag_restart) .or. gf_coldstart) then
!$acc kernels
forcet(:,:)=0.0
forceq(:,:)=0.0
Expand Down
7 changes: 7 additions & 0 deletions physics/CONV/Grell_Freitas/cu_gf_driver_pre.meta
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@
kind = kind_phys
intent = in
optional = True
[gf_coldstart]
standard_name = flag_for_cold_start_gf
long_name = flag to cold start G-F
units = flag
dimensions = ()
type = logical
intent = in
[rrfs_sd]
standard_name = do_smoke_coupling
long_name = flag controlling rrfs_sd collection
Expand Down
39 changes: 11 additions & 28 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ module GFS_phys_time_vary

private

public GFS_phys_time_vary_init, GFS_phys_time_vary_timestep_init, GFS_phys_time_vary_timestep_finalize, GFS_phys_time_vary_finalize

logical :: is_initialized = .false.
public GFS_phys_time_vary_init, GFS_phys_time_vary_timestep_init, GFS_phys_time_vary_finalize

real(kind=kind_phys), parameter :: con_hr = 3600.0_kind_phys
real(kind=kind_phys), parameter :: con_99 = 99.0_kind_phys
Expand Down Expand Up @@ -95,7 +93,8 @@ subroutine GFS_phys_time_vary_init (
smcwtdxy, deeprechxy, rechxy, snowxy, snicexy, snliqxy, tsnoxy , smoiseq, zsnsoxy, &
slc, smc, stc, tsfcl, snowd, canopy, tg3, stype, con_t0c, lsm_cold_start, nthrds, &
lkm, use_lake_model, lakefrac, lakedepth, iopt_lake, iopt_lake_clm, iopt_lake_flake, &
lakefrac_threshold, lakedepth_threshold, ozphys, h2ophys, errmsg, errflg)
lakefrac_threshold, lakedepth_threshold, ozphys, h2ophys, is_initialized, errmsg, &
errflg)

implicit none

Expand Down Expand Up @@ -193,6 +192,7 @@ subroutine GFS_phys_time_vary_init (
real(kind_phys), intent(in) :: con_t0c

integer, intent(in) :: nthrds
logical, intent(inout) :: is_initialized
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

Expand Down Expand Up @@ -713,7 +713,8 @@ subroutine GFS_phys_time_vary_timestep_init (
tsfc, tsfco, tisfc, hice, fice, facsf, facwf, alvsf, alvwf, alnsf, alnwf, zorli, zorll, &
zorlo, weasd, slope, snoalb, canopy, vfrac, vtype, stype,scolor, shdmin, shdmax, snowd, &
cv, cvb, cvt, oro, oro_uf, xlat_d, xlon_d, slmsk, landfrac, ozphys, h2ophys, &
do_ugwp_v1, jindx1_tau, jindx2_tau, ddy_j1tau, ddy_j2tau, tau_amf, errmsg, errflg)
do_ugwp_v1, jindx1_tau, jindx2_tau, ddy_j1tau, ddy_j2tau, tau_amf, is_initialized, &
errmsg, errflg)

implicit none

Expand Down Expand Up @@ -762,6 +763,7 @@ subroutine GFS_phys_time_vary_timestep_init (
real(kind_phys), intent(inout), optional :: smois(:,:), sh2o(:,:), tslb(:,:), tref(:)
integer, intent(inout) :: vtype(:), stype(:),scolor(:), slope(:)

logical, intent(in) :: is_initialized
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

Expand Down Expand Up @@ -931,36 +933,17 @@ subroutine GFS_phys_time_vary_timestep_init (
end subroutine GFS_phys_time_vary_timestep_init
!> @}

!> \section arg_table_GFS_phys_time_vary_timestep_finalize Argument Table
!! \htmlinclude GFS_phys_time_vary_timestep_finalize.html
!!
!>\section gen_GFS_phys_time_vary_timestep_finalize GFS_phys_time_vary_timestep_finalize General Algorithm
!> @{
subroutine GFS_phys_time_vary_timestep_finalize (errmsg, errflg)

implicit none

! Interface variables
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

! Initialize CCPP error handling variables
errmsg = ''
errflg = 0

end subroutine GFS_phys_time_vary_timestep_finalize
!> @}

!> \section arg_table_GFS_phys_time_vary_finalize Argument Table
!! \htmlinclude GFS_phys_time_vary_finalize.html
!!
subroutine GFS_phys_time_vary_finalize(errmsg, errflg)
subroutine GFS_phys_time_vary_finalize(is_initialized, errmsg, errflg)

implicit none

! Interface variables
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg
logical, intent(inout) :: is_initialized
character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

! Initialize CCPP error handling variables
errmsg = ''
Expand Down
39 changes: 20 additions & 19 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,13 @@
dimensions = ()
type = ty_h2ophys
intent = in
[is_initialized]
standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
long_name = flag carrying interstitial initialization status
units = flag
dimensions = ()
type = logical
intent = inout
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
Expand All @@ -1062,6 +1069,13 @@
[ccpp-arg-table]
name = GFS_phys_time_vary_finalize
type = scheme
[is_initialized]
standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
long_name = flag carrying interstitial initialization status
units = flag
dimensions = ()
type = logical
intent = inout
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
Expand Down Expand Up @@ -2055,26 +2069,13 @@
dimensions = ()
type = ty_h2ophys
intent = in
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
units = none
dimensions = ()
type = character
kind = len=*
intent = out
[errflg]
standard_name = ccpp_error_code
long_name = error code for error handling in CCPP
units = 1
[is_initialized]
standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
long_name = flag carrying interstitial initialization status
units = flag
dimensions = ()
type = integer
intent = out

########################################################################
[ccpp-arg-table]
name = GFS_phys_time_vary_timestep_finalize
type = scheme
type = logical
intent = in
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
Expand Down
7 changes: 2 additions & 5 deletions physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ subroutine sgscloud_radpre_run( &
nlay, plyr, xlat, dz,de_lgth, &
cldsa,mtopa,mbota, &
imp_physics, imp_physics_gfdl,&
imp_physics_fa, &
imp_physics_fa, conv_cf_opt, &
iovr, &
errmsg, errflg )

Expand All @@ -75,7 +75,7 @@ subroutine sgscloud_radpre_run( &
real(kind=kind_phys) :: gfac
integer, intent(in) :: im, levs, imfdeepcnv, imfdeepcnv_gf, &
& nlay, imfdeepcnv_sas, imfdeepcnv_c3, imp_physics, &
& imp_physics_gfdl, imp_physics_fa
& imp_physics_gfdl, imp_physics_fa, conv_cf_opt
logical, intent(in) :: flag_init, flag_restart, do_mynnedmf

real(kind=kind_phys), dimension(:,:), intent(inout) :: qc, qi
Expand Down Expand Up @@ -120,9 +120,6 @@ subroutine sgscloud_radpre_run( &
real :: a, f, sigq, qmq, qt, xl, th, thl, rsl, cpm, cb_cf
real(kind=kind_phys) :: tlk

!Option to convective cloud fraction
integer, parameter :: conv_cf_opt = 0 !0: C-B, 1: X-R

! Initialize CCPP error handling variables
errmsg = ''
errflg = 0
Expand Down
7 changes: 7 additions & 0 deletions physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,13 @@
dimensions = ()
type = integer
intent = in
[conv_cf_opt]
standard_name = option_for_convection_scheme_cloud_fraction_computation
long_name = option for convection scheme cloud fraction computation
units = flag
dimensions = ()
type = integer
intent = in
[qc_save]
standard_name = cloud_condensed_water_mixing_ratio_save
long_name = ratio of mass of cloud water to mass of dry air plus vapor (without condensates) before entering a physics scheme
Expand Down
Loading