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

Updated land perturbation scheme #176

Merged
merged 45 commits into from
Aug 31, 2020
Merged

Updated land perturbation scheme #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2f548a0
update to pre-existing land perts scheme, ready for addition of the n…
ClaraDraper-NOAA Mar 20, 2020
0204217
updates to land perts scheme, so that namelist input and control_type…
ClaraDraper-NOAA Mar 25, 2020
4ef35a5
updating .gitmodules to csd-*-sfcpert branches
ClaraDraper-NOAA Mar 26, 2020
b3605dd
reverting FV3 bad push
ClaraDraper-NOAA Mar 26, 2020
3783642
ccpp updates to old sfc pert team - does not compile
ClaraDraper-NOAA Apr 1, 2020
2a82615
replace my ccpp/framework fork with NCAR to fix clone
ClaraDraper-NOAA Apr 1, 2020
9132338
correcting missed ccp push
ClaraDraper-NOAA Apr 8, 2020
527f21b
Phil's ccpp changes
ClaraDraper-NOAA Apr 8, 2020
8344d54
Merge commit '7c3cdcac6ef5d9debaf15f2392d17bf05d7966c1' into csd-ufs-…
ClaraDraper-NOAA Apr 16, 2020
761fdd3
minor bug fix
ClaraDraper-NOAA Apr 16, 2020
d18e7d7
Comitting stochastic physics updates
ClaraDraper-NOAA Jun 25, 2020
709fb76
Comitting FV3 submodules updates
ClaraDraper-NOAA Jun 25, 2020
93e5c39
Updates for minimal set of regression tests.
ClaraDraper-NOAA Jun 26, 2020
3db0b53
changes to submodules.
ClaraDraper-NOAA Jul 9, 2020
59169f8
Merge commit 'dba56e51caf3734bfedcf38ff2e82a3cd49f94fe' into csd-ufs-…
ClaraDraper-NOAA Jul 9, 2020
5a0b629
lndp sub-module clean-up
ClaraDraper-NOAA Jul 20, 2020
130889a
Updates to tests to include new input parameters for revised land per…
ClaraDraper-NOAA Jul 20, 2020
eb6c8af
NEMS submodule update
ClaraDraper-NOAA Jul 20, 2020
9ef2c71
FV3 submodule merge
ClaraDraper-NOAA Jul 20, 2020
fb53d48
Merge commit '28338584c60366d0d7ad1bf90faa101a796bdbf2' into csd-ufs-…
ClaraDraper-NOAA Jul 20, 2020
c3e8dac
Merge commit '28338584c60366d0d7ad1bf90faa101a796bdbf2' into csd-ufs-…
ClaraDraper-NOAA Jul 20, 2020
c3d7eb3
Clean-up of comments / print statements for lndp code.
ClaraDraper-NOAA Jul 26, 2020
70ea48d
Merge branch 'csd-ufs-sfcpert' of https://github.com/ClaraDraper-NOAA…
ClaraDraper-NOAA Jul 26, 2020
63248de
FV3 update to fix typo in vegfrac name
ClaraDraper-NOAA Jul 27, 2020
a237414
FV3 update to fix typo in vegfrac name
ClaraDraper-NOAA Jul 27, 2020
7ca00c4
Merge branch 'csd-ufs-sfcpert' of https://github.com/ClaraDraper-NOAA…
ClaraDraper-NOAA Jul 27, 2020
e8042a0
reverting to NCAR's ccpp framework repository.
ClaraDraper-NOAA Jul 28, 2020
2f91128
merging remote submodule updates
ClaraDraper-NOAA Aug 11, 2020
3dbe604
Submodules updates to merge latest remote
ClaraDraper-NOAA Aug 11, 2020
47b3049
Merge commit '7e29c33f07726e2da5663ee50d052d9efd372c0a' into csd-ufs-…
ClaraDraper-NOAA Aug 11, 2020
41b4cd2
Submodule merges
ClaraDraper-NOAA Aug 25, 2020
29c1197
Merge commit '2e0dc94859c0002ab1632484906a9ee15145f97d' into csd-ufs-…
ClaraDraper-NOAA Aug 25, 2020
6314c0d
Updated submodules
ClaraDraper-NOAA Aug 25, 2020
f31e373
FV3 submodule update
ClaraDraper-NOAA Aug 25, 2020
664bcbd
submodules updates to remove fv3 dependency from stochastic physics
ClaraDraper-NOAA Aug 27, 2020
f58f0d5
submodule edits to compile eith gnumake
ClaraDraper-NOAA Aug 27, 2020
3e21bf8
rt.sh date update
ClaraDraper-NOAA Aug 27, 2020
15c6fac
revert rt.sh, bugfix for gnu in stochastic_phsyics
ClaraDraper-NOAA Aug 27, 2020
89ae1e1
Merge commit '1e4edf0ac90d8de714becfa362c36de8758b8281' into csd-ufs-…
ClaraDraper-NOAA Aug 27, 2020
3f974b5
Update log files from Dom
ClaraDraper-NOAA Aug 28, 2020
a593c66
Orion log files from Dom
ClaraDraper-NOAA Aug 28, 2020
8b68b10
added WCOSS log file
ClaraDraper-NOAA Aug 28, 2020
d5886bf
WCOSS cray log file
ClaraDraper-NOAA Aug 30, 2020
aae7e7e
reverted to NOAA-EMC/develop for FV3 submodule
ClaraDraper-NOAA Aug 31, 2020
f4b5714
reverted stochastic physics repo
ClaraDraper-NOAA Aug 31, 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
3 changes: 2 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics
branch = master
branch = master
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would you please remove the extra space and extra line below?


2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 15 files
+2 −2 .gitmodules
+5 −2 atmos_model.F90
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+0 −1 gfsphysics/CMakeLists.txt
+1 −0 gfsphysics/GFS_layer/GFS_driver.F90
+26 −29 gfsphysics/GFS_layer/GFS_physics_driver.F90
+13 −8 gfsphysics/GFS_layer/GFS_radiation_driver.F90
+23 −32 gfsphysics/GFS_layer/GFS_typedefs.F90
+30 −51 gfsphysics/GFS_layer/GFS_typedefs.meta
+1 −1 gfsphysics/physics/GFS_debug.F90
+3 −3 gfsphysics/physics/radiation_surface.f
+3 −3 gfsphysics/physics/sfc_drv.f
+1 −1 stochastic_physics/makefile
+79 −16 stochastic_physics/stochastic_physics_wrapper.F90
3 changes: 2 additions & 1 deletion parm/ccpp.gocart.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
do_sfcperts = @[DO_SFCPERTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
/

&gfdl_cloud_microphysics_nml
Expand Down
18 changes: 6 additions & 12 deletions parm/ccpp_ca.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
do_sfcperts = @[DO_SFCPERTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
do_ca = @[DO_CA]
ca_sgs = @[CA_SGS]
ca_global = @[CA_GLOBAL]
Expand Down Expand Up @@ -282,17 +283,10 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
/

&cires_ugwp_nml
Expand Down
18 changes: 6 additions & 12 deletions parm/ccpp_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
do_sfcperts = @[DO_SFCPERTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
do_ca = .false.
ca_sgs = .false.
nca = 1
Expand Down Expand Up @@ -284,17 +285,10 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
/

&cires_ugwp_nml
Expand Down
3 changes: 2 additions & 1 deletion parm/ccpp_gfdlmp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
do_sfcperts = @[DO_SFCPERTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
/

&gfdl_cloud_microphysics_nml
Expand Down
18 changes: 6 additions & 12 deletions parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@
do_sppt = @[DO_SPPT]
do_shum = @[DO_SHUM]
do_skeb = @[DO_SKEB]
do_sfcperts = @[DO_SFCPERTS]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lsm = @[LSM]
lsoil_lsm = @[LSOIL_LSM]
iopt_dveg = 2
Expand Down Expand Up @@ -312,17 +313,10 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
/

&cires_ugwp_nml
Expand Down
18 changes: 6 additions & 12 deletions parm/ccpp_gsd_sar.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@
do_sppt = .F.
do_shum = .F.
do_skeb = .F.
do_sfcperts = .F.
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lsm = 3
lsoil = 4
lsoil_lsm = 9
Expand Down Expand Up @@ -283,17 +284,10 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
/

&cires_ugwp_nml
Expand Down
18 changes: 6 additions & 12 deletions parm/ccpp_gsd_sar_25km.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@
do_sppt = .F.
do_shum = .F.
do_skeb = .F.
do_sfcperts = .F.
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lsm = 3
lsoil = 9
lsoil_lsm = 9
Expand Down Expand Up @@ -299,15 +300,8 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
/
18 changes: 6 additions & 12 deletions parm/ccpp_gsd_sar_v1.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@
do_sppt = .F.
do_shum = .F.
do_skeb = .F.
do_sfcperts = .F.
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lsm = 1
lsoil = 4
iopt_dveg = 2
Expand Down Expand Up @@ -281,17 +282,10 @@
ISEED_SPPT=3,
/
&nam_sfcperts
NSFCPERT=6,
PERTZ0=-999.,
PERTSHC=-999.,
PERTZT=-999.,
PERTLAI=-999.,
PERTVEGF=-999.,
PERTALB=-999.,
SFC_TAU=21600,
SFC_LSCALE=500000,
ISEED_SFC=0,
SPPT_LAND=.FALSE.,
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010
/

&cires_ugwp_nml
Expand Down
Loading