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

merge gsl institutional fork #526

Merged
merged 164 commits into from
May 17, 2022
Merged

merge gsl institutional fork #526

Show file tree
Hide file tree
Changes from 147 commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
478d348
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Nov 25, 2020
bd71c2a
RUC ice for gsl/develop (replaces #54 and #56) (#60)
DomHeinzeller Dec 1, 2020
c59787a
Update gsl/develop from develop 2020/12/08 (#61)
climbfuji Dec 8, 2020
b1e98cf
Update submodule pointer for ccpp-physics - MYNN surface layer update…
climbfuji Dec 16, 2020
6ecee94
Land stochastic perturbations (wrapper PR for #65) (#68)
climbfuji Jan 9, 2021
fa070c8
Stochastic land perturbations: add roughness length over land to the …
tanyasmirnova Jan 19, 2021
c48b45a
Update gsl/develop from develop 2021/02/22 (#73)
climbfuji Feb 23, 2021
730ac5d
Remove inconsistencies in computation of air density with Thompson MP…
climbfuji Feb 26, 2021
4516ae0
Update thompson mp 20210213 (#567) for gsl/develop (#75)
climbfuji Mar 16, 2021
08fc9fe
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Mar 17, 2021
1c59364
Revert change to .gitmodules and update submodule pointer for ccpp-fr…
climbfuji Mar 18, 2021
c4dff78
Merge pull request #77 from climbfuji/update_gsl_develop_from_master_…
DomHeinzeller Mar 18, 2021
7fb4c30
&gfs_physics_nml print_diff_pgr=.true. will print per-timestep pgr ch…
SamuelTrahanNOAA Mar 25, 2021
c19100b
point to sam's repository for atmos_cubed_sphere
SamuelTrahanNOAA Mar 25, 2021
6f9299b
Add units and lat/lon to per-timestep pgr stats
SamuelTrahanNOAA Mar 25, 2021
1d47548
Rebase atmos_cubed_sphere to NOAA-GFDL dev/emc branch
SamuelTrahanNOAA Mar 25, 2021
cd31df5
Print mean pgr change as hPa/hr and other pgr data as bars.
SamuelTrahanNOAA Mar 25, 2021
84c9f0b
Remove changes from atmos_cubed_sphere and simplify atmos_model.F90 c…
SamuelTrahanNOAA Mar 26, 2021
591edc0
print mean abs change instead of mean change in pgr
SamuelTrahanNOAA Mar 26, 2021
ad2f849
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Mar 31, 2021
1f82c5f
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Mar 31, 2021
e51884b
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Apr 1, 2021
e2108f0
Merge pull request #79 from climbfuji/update_gsl_develop_from_develop…
DomHeinzeller Apr 1, 2021
b92eeeb
clarify one print
SamuelTrahanNOAA Apr 1, 2021
837f7b4
Merge remote-tracking branch 'gsl/gsl/develop' into feature/per-times…
SamuelTrahanNOAA Apr 1, 2021
6814d1a
Merge pull request #78 from SamuelTrahanNOAA/feature/per-timestep-pgr…
DomHeinzeller Apr 2, 2021
51d7265
More 3D diagnostic tendencies (#76)
SamuelTrahanNOAA Apr 12, 2021
aa22b69
Fix incorrect units in dtend metadata (#82)
SamuelTrahanNOAA Apr 23, 2021
a16085a
Add SO2 tendency units (#86)
SamuelTrahanNOAA Apr 26, 2021
78e1af4
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji May 20, 2021
01cdd8a
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji May 20, 2021
ef024c7
Update submodule pointer for ccpp-physics
climbfuji May 21, 2021
e361a82
Revert change to .gitmodules and update submodule pointer for ccpp-fr…
climbfuji May 21, 2021
7946352
Merge pull request #89 from climbfuji/update_gsl_develop_from_develop
DomHeinzeller May 21, 2021
d38ae34
dtend: add missing tendencies and fix bugs in convection tendencies (…
SamuelTrahanNOAA May 28, 2021
7fc40be
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji May 31, 2021
97aa974
Update .gitmodules for code review and regression testing
climbfuji May 31, 2021
06c0421
Formatting changes in ccpp/data/GFS_typedefs.F90
climbfuji Jun 2, 2021
7c257a0
Update submodule pointer for ccpp-physics
climbfuji Jun 2, 2021
30f3b80
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Jun 2, 2021
5b75e26
Update submodule pointer for ccpp-physics
climbfuji Jun 3, 2021
de014c4
Point update_gsl_develop_from_develop_20210531 to NOAA-GSL branches o…
SamuelTrahanNOAA Jun 7, 2021
09e9839
Merge branch 'update_gsl_develop_from_develop_20210531' into gsl/develop
SamuelTrahanNOAA Jun 7, 2021
52c8014
GF aerosols updates and tunings
hannahcbarnes Jul 9, 2021
487c7de
GF aerosol updates and tunings from physics
hannahcbarnes Jul 9, 2021
6c0262b
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jul 12, 2021
f0ed0f1
Merge branch 'HCBaerosols' of https://github.com/hannahcbarnes/fv3atm…
climbfuji Jul 12, 2021
dcbc0ec
Update submodule pointer for ccpp-physics
climbfuji Jul 12, 2021
3a9e20d
Update submodule pointer for ccpp-physics
climbfuji Jul 14, 2021
8043a8a
Update submodule pointer for ccpp-physics
climbfuji Jul 15, 2021
ec202a3
Make aod_gf and cactiv_m work appriopriately for restarts
hannahcbarnes Jul 15, 2021
27d28d8
Merge branch 'HCBaerosols' of https://github.com/hannahcbarnes/fv3atm…
climbfuji Jul 15, 2021
398e951
Add missing metadata for new GF arrays
climbfuji Jul 15, 2021
a693372
Bug fix in ccpp/driver/GFS_restart.F90 for GF
climbfuji Jul 16, 2021
ce42a41
Update submodule pointer for ccpp-physics
climbfuji Jul 16, 2021
dfa935d
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jul 19, 2021
4e14419
Add missing active attribute for aod_gf in ccpp/data/GFS_typedefs.meta
climbfuji Jul 19, 2021
7f08cc3
Merge pull request #101 from climbfuji/gsl_develop_hannah_and_joe_cha…
DomHeinzeller Jul 19, 2021
5f1094c
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Jul 21, 2021
9c98448
Update submodule pointer for ccpp-physics
climbfuji Jul 21, 2021
de2e423
Update submodule pointer for ccpp-physocs
climbfuji Jul 21, 2021
cf09695
Change name of sfc_name2(39) from 'weasd' to 'weasdl' in io/FV3GFS_io…
climbfuji Jul 24, 2021
cf1ea3b
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Jul 27, 2021
4b11bd8
Merge pull request #102 from climbfuji/update_gsl_develop_from_develo…
DomHeinzeller Jul 27, 2021
81c9a02
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jul 28, 2021
16c2b7c
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Aug 4, 2021
f6fbd77
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Aug 11, 2021
6b1a37d
Merge pull request #103 from climbfuji/joe_mynnedmf_update_20210804
DomHeinzeller Aug 11, 2021
fd51142
Changed dimensions of variables tsnow_land and sncovr_ice from
tanyasmirnova Aug 12, 2021
66a31da
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Aug 13, 2021
37391a3
Added Flake to two suites: FV3_GSD_v0 and FV3_HRRR.
tanyasmirnova Aug 16, 2021
56ee817
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Aug 18, 2021
fcc7a86
Merge pull request #3 from climbfuji/tanya_gsl_dev_11aug21_lake_dom
tanyasmirnova Aug 18, 2021
77ecd33
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Aug 19, 2021
cec7cc7
Update submodule pointer for ccpp-physics
climbfuji Aug 23, 2021
309a912
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Aug 23, 2021
ba66748
Update to ccpp/data/GFS_typedefs.meta following CCPP standard names u…
climbfuji Aug 23, 2021
52b38b8
Merge pull request #4 from climbfuji/tanya_gsl_dev_11aug21_lake_dom
tanyasmirnova Aug 23, 2021
3c6404a
Merge pull request #105 from tanyasmirnova/gsl_dev_11aug21_lake
DomHeinzeller Aug 23, 2021
57d535a
Update submodule pointer for ccpp-physics
climbfuji Aug 23, 2021
c2424da
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Aug 24, 2021
aa11e39
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Aug 24, 2021
9beb0f9
Merge pull request #104 from climbfuji/GF_RadiationUpdate_RevertAerosols
DomHeinzeller Aug 24, 2021
043f425
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Aug 24, 2021
ced5cde
Revert change to .gitmodules and update submodule pointers for ccpp-p…
climbfuji Aug 26, 2021
b335f3a
Merge pull request #106 from climbfuji/update_gsl_develop_from_main_2…
DomHeinzeller Aug 26, 2021
3f01718
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Sep 21, 2021
3dadef9
Revert change to .gitmodules and update submodule pointers for ccpp-f…
climbfuji Sep 22, 2021
10eaeed
Merge pull request #108 from climbfuji/update_gsl_develop_from_develo…
DomHeinzeller Sep 22, 2021
0f661ab
Turn on GF aerosol-awareness
hannahcbarnes Oct 14, 2021
f03f84a
Update .gitmodules and submodule pointers for ccpp-framework and ccpp…
climbfuji Oct 19, 2021
f35a400
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Oct 19, 2021
45910f0
Switch back to NCAR ccpp-framework main, abandon NOAA-GSL fork
climbfuji Oct 19, 2021
98b9206
Update submodule pointer for ccpp-physics
hannahcbarnes Oct 20, 2021
d871366
Update submodule pointer for ccpp/physics
climbfuji Oct 20, 2021
811dc67
Merge branch 'GF_Tune_Oct2021' of https://github.com/hannahcbarnes/fv…
climbfuji Oct 20, 2021
fb4f45b
Merge pull request #1 from climbfuji/hannah_gf_dom
hannahcbarnes Oct 20, 2021
bf540b0
Merge pull request #110 from hannahcbarnes/GF_Tune_Oct2021
DomHeinzeller Oct 20, 2021
d9af39b
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Oct 20, 2021
8dbb5a7
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Oct 20, 2021
fa64c2b
Update submodule pointer for ccpp-physics
climbfuji Oct 20, 2021
ef0c510
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Oct 21, 2021
0e6ff3b
Merge pull request #112 from climbfuji/joe_mynn_updates_20211020
DomHeinzeller Oct 21, 2021
a6d0025
Merge branch 'gsl/develop' of https://github.com/NOAA-GSL/fv3atm into…
climbfuji Oct 21, 2021
2ea026f
Update submodule pointer for ccpp-physics
climbfuji Oct 21, 2021
c8f3468
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Oct 22, 2021
cf009f2
Merge pull request #111 from climbfuji/update_gsl_develop_from_develo…
DomHeinzeller Oct 22, 2021
8423117
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Oct 25, 2021
e604e31
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into gsl…
climbfuji Oct 25, 2021
ce003b4
Update submodule pointer for ccpp-physics
climbfuji Oct 26, 2021
89c1f50
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Oct 27, 2021
fd66c77
Merge pull request #113 from climbfuji/gsl_develop_update_from_develo…
DomHeinzeller Oct 27, 2021
9eaec46
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Nov 1, 2021
e090b4d
Update submodule pointer for ccpp-physics
climbfuji Nov 8, 2021
af1aeab
Revert .gitmodules and update submodule pointer for ccpp-physics
climbfuji Nov 8, 2021
6c90939
Merge pull request #115 from climbfuji/tanya_ruclsm_mynnsfclay
DomHeinzeller Nov 8, 2021
8f96e33
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Nov 16, 2021
43bb1bd
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Nov 18, 2021
806b3f3
Merge pull request #117 from climbfuji/update_gsl_develop_from_develo…
DomHeinzeller Nov 18, 2021
01d9a8c
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Nov 23, 2021
c5d2aae
Revert .gitmodules and update submodule pointer for ccpp-physics
climbfuji Nov 24, 2021
07ed3e8
Merge pull request #118 from climbfuji/mike_gsl_develop_SSGWD_bugfix
DomHeinzeller Nov 24, 2021
dd8b65d
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Dec 15, 2021
3fdadd4
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Dec 15, 2021
ff70152
Fix merge conflicts
climbfuji Dec 15, 2021
2c2f799
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Dec 15, 2021
1df1fc4
Merge pull request #120 from climbfuji/update_gsl_develop_from_develo…
DomHeinzeller Dec 15, 2021
1679dc0
Updates to MYNN-EDMF, part II - goes with PR for ccpp-physics (#121)
joeolson42 Feb 15, 2022
b76d1fb
Add a cloud fraction to GF scheme, and separate frozen subgrid clouds…
joeolson42 Feb 24, 2022
03bfaee
Merge NOAA-EMC develop into gsl/develop (#126)
christinaholtNOAA Mar 8, 2022
b82d5c6
Remove GF Consistency Check & Add SDFs - V2 (#127)
hannahcbarnes Mar 9, 2022
ae7feac
Update to top of gsl/physics to get codeowners (#130)
SamuelTrahanNOAA Mar 10, 2022
036f0b3
updates related to MYNN-EDMF (#135)
joeolson42 Mar 24, 2022
5d9f221
GWD, LSM and MYNN physics updates from RRFS_dev branch (#136)
mdtoyNOAA Mar 25, 2022
dd68016
move some parameters in mynn surface layer to namelist options
joeolson42 Mar 25, 2022
6f60c52
Point to top of gsl/develop for ccpp-physics
SamuelTrahanNOAA Mar 29, 2022
ae22dce
gsl/develop RRFS-Smoke (#141)
haiqinli Apr 21, 2022
75396de
Correction to prior commit: point ccpp-physics to NOAA-GSL gsl/develop
SamuelTrahanNOAA Apr 21, 2022
ff41d1c
Merge NOAA-EMC develop
SamuelTrahanNOAA Apr 22, 2022
20f6731
point to gsl/merge-develop branch
SamuelTrahanNOAA Apr 22, 2022
db3107c
Point to gsl/merge-develop-to-community branch for ccpp/physics
SamuelTrahanNOAA Apr 22, 2022
86a111a
Corrections to merge + joe updates
SamuelTrahanNOAA Apr 23, 2022
de62617
Merge remote-tracking branch 'joe/mynn2' into gsl/merge-develop-to-co…
SamuelTrahanNOAA Apr 23, 2022
de363fe
Point .gitmodules to Sam's fork
SamuelTrahanNOAA Apr 27, 2022
8c60e05
Correct issues found by reviewers
SamuelTrahanNOAA Apr 27, 2022
dbb405c
Rename mynnpbl to mynnedmf
SamuelTrahanNOAA Apr 27, 2022
dc25f3d
Remove some empty _init and _finalize routines and update a comment i…
SamuelTrahanNOAA Apr 27, 2022
45955d0
Add \file to smoke files
SamuelTrahanNOAA Apr 28, 2022
2400711
adding bug fix from jili dong and removing U* averaging
SamuelTrahanNOAA May 5, 2022
189806f
adding bug fix from jili dong and removing U* averaging
SamuelTrahanNOAA May 5, 2022
6613803
Merge develop
SamuelTrahanNOAA May 5, 2022
ba5e9b7
Remove some commented-out code from cu_gf_driver in ccpp-physics.
SamuelTrahanNOAA May 6, 2022
fda178f
Turn rrtmg smoke band 10 into a model namelist variable
SamuelTrahanNOAA May 6, 2022
da0435f
Switch ccpp-physics smoke arguments to implied shape
SamuelTrahanNOAA May 6, 2022
ebbcfb7
Remove some stops and gotos from ccpp-physics smoke
SamuelTrahanNOAA May 6, 2022
1fc9e5f
Remove some hard-coded constants and rename some meta entries
SamuelTrahanNOAA May 9, 2022
b03c955
Rename some standard_names, change a unit, and remove a "use physcons"
SamuelTrahanNOAA May 9, 2022
c302ad5
merge develop
SamuelTrahanNOAA May 11, 2022
8edf82e
Set num3d correctly when using radar_tten
SamuelTrahanNOAA May 11, 2022
fe30500
Only add cnv_3d_ud_mf to the restart files when needed
SamuelTrahanNOAA May 13, 2022
e3a3c7e
Pass some chemistry varibles to mynn_bl_driver correctly
SamuelTrahanNOAA May 16, 2022
981e49d
Correct argument passing within mynn edmf
SamuelTrahanNOAA May 16, 2022
4bf92d9
point to NCAR main ccpp/physics
SamuelTrahanNOAA May 17, 2022
ee9cb8d
Merge branch 'gsl/merge-develop-to-community' of ssh://github.com/Sam…
SamuelTrahanNOAA May 17, 2022
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
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
url = https://github.com/SamuelTrahanNOAA/ccpp-physics
branch = gsl/merge-develop-to-community
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
6 changes: 5 additions & 1 deletion ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
'physics/physics/satmedmfvdifq.F',
'physics/physics/shinhongvdif.F90',
'physics/physics/ysuvdif.F90',
'physics/physics/mynnpbl_wrapper.F90',
'physics/physics/mynnedmf_wrapper.F90',
'physics/physics/mynnsfc_wrapper.F90',
'physics/physics/sgscloud_radpre.F90',
'physics/physics/sgscloud_radpost.F90',
Expand Down Expand Up @@ -213,6 +213,10 @@
'physics/physics/sfc_sice.f',
SamuelTrahanNOAA marked this conversation as resolved.
Show resolved Hide resolved
# HAFS FER_HIRES
'physics/physics/mp_fer_hires.F90',
# SMOKE
'physics/smoke/rrfs_smoke_wrapper.F90',
'physics/smoke/rrfs_smoke_postpbl.F90',
'physics/smoke/rrfs_smoke_lsdep_wrapper.F90',
# RRTMGP
'physics/physics/rrtmgp_lw_gas_optics.F90',
'physics/physics/rrtmgp_lw_cloud_optics.F90',
Expand Down
14 changes: 7 additions & 7 deletions ccpp/data/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,6 +1824,13 @@
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
[save_q(:,:,index_of_snow_mixing_ratio_in_tracer_concentration_array)]
standard_name = snow_mixing_ratio_save
long_name = ratio of mass of snow water to mass of dry air plus vapor (without condensates) before entering a physics scheme
units = kg kg-1
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
[save_q(:,:,index_of_cloud_ice_mixing_ratio_in_tracer_concentration_array)]
standard_name = ice_water_mixing_ratio_save
long_name = cloud ice water mixing ratio before entering a physics scheme
Expand Down Expand Up @@ -2156,13 +2163,6 @@
units = count
dimensions = ()
type = integer
[ud_mf]
standard_name = instantaneous_atmosphere_updraft_convective_mass_flux
long_name = (updraft mass flux) * delt
units = kg m-2
dimensions = (horizontal_loop_extent,vertical_layer_dimension)
type = real
kind = kind_phys
[uustar_water]
standard_name = surface_friction_velocity_over_water
long_name = surface friction velocity over water
Expand Down
230 changes: 216 additions & 14 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading