From 45a9e9b53b083a741e2385da2473d3e8c35f1dde Mon Sep 17 00:00:00 2001 From: jeff beck Date: Sat, 2 Apr 2022 17:50:48 +0000 Subject: [PATCH 01/19] Point to fork of ccpp-physics --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..8b57d326f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics + url = https://github.com/JeffBeck-NOAA/ccpp-physics branch = main [submodule "upp"] path = upp From 4992045c83fb7802047f568bf59dea09d07e16d3 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Sat, 2 Apr 2022 18:19:08 +0000 Subject: [PATCH 02/19] Point to fork of ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a8e0f0c8f..ff6395ca4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a8e0f0c8fccad4b93a172af5bcd07d8bdff00344 +Subproject commit ff6395ca4d18e41118dba721d43202937dfa951e From ed166d746323c83afcfaf0b100ce77d20e3d7412 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Sat, 2 Apr 2022 18:46:13 +0000 Subject: [PATCH 03/19] Point to bugfix/SPP branch in fork of ccpp-physics --- .gitmodules | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8b57d326f..fd502944e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/JeffBeck-NOAA/ccpp-physics - branch = main + branch = bugfix/SPP [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index ff6395ca4..313d78f77 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ff6395ca4d18e41118dba721d43202937dfa951e +Subproject commit 313d78f7798e6aac27df8d86669163864ada1ebf From ddd27ebddaaa2f367b74654d820e7ba21295d57d Mon Sep 17 00:00:00 2001 From: jeff beck Date: Tue, 5 Apr 2022 23:23:06 +0000 Subject: [PATCH 04/19] Pass SPP namelist entries outside of stochastic physics routines. --- ccpp/data/GFS_typedefs.F90 | 3 +++ ccpp/data/GFS_typedefs.meta | 9 ++++++++- stochastic_physics/stochastic_physics_wrapper.F90 | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index c4ece0914..5fd232baf 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1199,6 +1199,7 @@ module GFS_typedefs integer :: n_var_spp character(len=3) , pointer :: spp_var_list(:) ! dimension here must match n_var_spp in stochy_nml_def real(kind=kind_phys), pointer :: spp_prt_list(:) ! dimension here must match n_var_spp in stochy_nml_def + real(kind=kind_phys), pointer :: spp_stddev_cutoff(:) ! dimension here must match n_var_spp in stochy_nml_def !--- tracer handling character(len=32), pointer :: tracer_names(:) !< array of initialized tracers from dynamic core @@ -4527,8 +4528,10 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & if (Model%do_spp) then allocate(Model%spp_var_list(Model%n_var_spp)) allocate(Model%spp_prt_list(Model%n_var_spp)) + allocate(Model%spp_stddev_cutoff(Model%n_var_spp)) Model%spp_var_list(:) = '' Model%spp_prt_list(:) = clear_val + Model%spp_stddev_cutoff(:) = clear_val end if !--- cellular automata options diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index e6012a92e..0717d6767 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4844,12 +4844,19 @@ dimensions = () type = integer [spp_prt_list] - standard_name =magnitude_of_spp_perturbations + standard_name = magnitude_of_spp_perturbations long_name = magnitude of spp perturbations units = 1 dimensions = (number_of_spp_schemes_perturbed) type = real kind = kind_phys +[spp_stddev_cutoff] + standard_name = magnitude_of_spp_standard_deviation_cutoff + long_name = magnitude of spp standard deviation cutoff + units = 1 + dimensions = (number_of_spp_schemes_perturbed) + type = real + kind = kind_phys [spp_var_list] standard_name = perturbed_spp_schemes long_name = perturbed spp schemes diff --git a/stochastic_physics/stochastic_physics_wrapper.F90 b/stochastic_physics/stochastic_physics_wrapper.F90 index ae67c0daf..f5a285d2d 100644 --- a/stochastic_physics/stochastic_physics_wrapper.F90 +++ b/stochastic_physics/stochastic_physics_wrapper.F90 @@ -109,7 +109,7 @@ subroutine stochastic_physics_wrapper (GFS_Control, GFS_Data, Atm_block, ierr) GFS_Control%input_nml_file, GFS_Control%fn_nml, GFS_Control%nlunit, xlon, xlat, GFS_Control%do_sppt, GFS_Control%do_shum, & GFS_Control%do_skeb, GFS_Control%lndp_type, GFS_Control%n_var_lndp, GFS_Control%use_zmtnblck, GFS_Control%skeb_npass, & GFS_Control%lndp_var_list, GFS_Control%lndp_prt_list, & - GFS_Control%n_var_spp, GFS_Control%spp_var_list, GFS_Control%spp_prt_list, GFS_Control%do_spp, & + GFS_Control%n_var_spp, GFS_Control%spp_var_list, GFS_Control%spp_prt_list, GFS_Control%spp_stddev_cutoff, GFS_Control%do_spp, & GFS_Control%ak, GFS_Control%bk, nthreads, GFS_Control%master, GFS_Control%communicator, ierr) if (ierr/=0) then write(6,*) 'call to init_stochastic_physics failed' From 5ada9598d126caaba43513d91e78ef361b2ae09d Mon Sep 17 00:00:00 2001 From: jeff beck Date: Tue, 5 Apr 2022 23:25:36 +0000 Subject: [PATCH 05/19] Update ccpp/physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 313d78f77..6342e52f1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 313d78f7798e6aac27df8d86669163864ada1ebf +Subproject commit 6342e52f18260f9a5f50bdad39e84c7aa964d7a5 From 6fcdc0453988bd47f938a01d2e39c86d13a6cbae Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 6 Apr 2022 00:14:08 +0000 Subject: [PATCH 06/19] Update ccpp/physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 6342e52f1..16993b9cd 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6342e52f18260f9a5f50bdad39e84c7aa964d7a5 +Subproject commit 16993b9cde77c1a4c80dee010c4436737ec20c4e From c9cde9446327b8a6d16f2fc3faa685a8d6cd92f8 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 6 Apr 2022 00:44:18 +0000 Subject: [PATCH 07/19] Update ccpp/physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 16993b9cd..084551f20 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 16993b9cde77c1a4c80dee010c4436737ec20c4e +Subproject commit 084551f20fae11029e30d4ab48d603c13396463b From b459cfad50b1c54571529ba17006a46b61968a2a Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 6 Apr 2022 21:32:06 +0000 Subject: [PATCH 08/19] Fixes to SPP metadata --- ccpp/data/GFS_typedefs.meta | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 0717d6767..d9bda21ca 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4847,21 +4847,21 @@ standard_name = magnitude_of_spp_perturbations long_name = magnitude of spp perturbations units = 1 - dimensions = (number_of_spp_schemes_perturbed) + dimensions = (number_of_perturbed_spp_schemes) type = real kind = kind_phys [spp_stddev_cutoff] standard_name = magnitude_of_spp_standard_deviation_cutoff long_name = magnitude of spp standard deviation cutoff units = 1 - dimensions = (number_of_spp_schemes_perturbed) + dimensions = (number_of_perturbed_spp_schemes) type = real kind = kind_phys [spp_var_list] standard_name = perturbed_spp_schemes long_name = perturbed spp schemes units = none - dimensions = (number_of_spp_schemes_perturbed) + dimensions = (number_of_perturbed_spp_schemes) type = character kind = len=3 [spp_pbl] From a4aee163f7e9d30dfe96903fb932d7fb6dede654 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 6 Apr 2022 21:33:13 +0000 Subject: [PATCH 09/19] Update pointer to ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 084551f20..a2fefa76e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 084551f20fae11029e30d4ab48d603c13396463b +Subproject commit a2fefa76e4ed84716af113476aa933a9826e619b From 9fdf4c0928f9d8458daa7a580c28d3b9dd52d487 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 7 Apr 2022 21:31:51 +0000 Subject: [PATCH 10/19] Update ccpp/physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a2fefa76e..fdc9b2e61 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a2fefa76e4ed84716af113476aa933a9826e619b +Subproject commit fdc9b2e61609041cc3c0f778a9007325161127a4 From 74e3f712def8d701f6df8769c06d6ebd05b8dc1f Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 7 Apr 2022 21:39:35 +0000 Subject: [PATCH 11/19] Update pointer for ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index fdc9b2e61..2e8f3404f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fdc9b2e61609041cc3c0f778a9007325161127a4 +Subproject commit 2e8f3404f76ca9a7b0eb1440741cdab2021f8e38 From 776adc2a408c7d10b6a973a5e0db7e962f0427c1 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Fri, 8 Apr 2022 18:47:29 +0000 Subject: [PATCH 12/19] Update ccpp-physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 2e8f3404f..dc48d3991 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2e8f3404f76ca9a7b0eb1440741cdab2021f8e38 +Subproject commit dc48d399196dc7618cf2c24fcbcd7b2035f14683 From c74ea44e8593a0005349f96e1c32ebf791dd0291 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Tue, 12 Apr 2022 18:46:11 +0000 Subject: [PATCH 13/19] Update ccpp/physics pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index dc48d3991..32b78e439 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit dc48d399196dc7618cf2c24fcbcd7b2035f14683 +Subproject commit 32b78e4391d1d0d63db92c040d1c252c53c67276 From ef82808750ce95a0d78fe92465bd23fcbb94733f Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 14 Apr 2022 15:23:45 +0000 Subject: [PATCH 14/19] Add active attribute to spp_prt_list --- ccpp/data/GFS_typedefs.meta | 1 + 1 file changed, 1 insertion(+) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index c1aad0ca5..7ccf89a42 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4864,6 +4864,7 @@ dimensions = (number_of_perturbed_spp_schemes) type = real kind = kind_phys + active = (do_stochastically_perturbed_parameterizations) [spp_stddev_cutoff] standard_name = magnitude_of_spp_standard_deviation_cutoff long_name = magnitude of spp standard deviation cutoff From aeccbcee6b8897efbcdf7607c1843ddd313cc6e4 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 14 Apr 2022 15:44:16 +0000 Subject: [PATCH 15/19] Add active metadata flag to spp_stddev_cutoff --- ccpp/data/GFS_typedefs.meta | 1 + 1 file changed, 1 insertion(+) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 7ccf89a42..c6e4bf72a 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4872,6 +4872,7 @@ dimensions = (number_of_perturbed_spp_schemes) type = real kind = kind_phys + active = (do_stochastically_perturbed_parameterizations) [spp_var_list] standard_name = perturbed_spp_schemes long_name = perturbed spp schemes From 175d46dfa4ab4dad99a586b003dbf121e0f44037 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Thu, 14 Apr 2022 16:03:33 +0000 Subject: [PATCH 16/19] Add active metadata flag for spp_var_list --- ccpp/data/GFS_typedefs.meta | 1 + 1 file changed, 1 insertion(+) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index c6e4bf72a..aacc64b86 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4880,6 +4880,7 @@ dimensions = (number_of_perturbed_spp_schemes) type = character kind = len=3 + active = (do_stochastically_perturbed_parameterizations) [spp_pbl] standard_name = control_for_pbl_spp_perturbations long_name = control for pbl spp perturbations From fc28d29a444e1bf55b9e3464135c90ec5b963406 Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 20 Apr 2022 15:04:26 +0000 Subject: [PATCH 17/19] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fd502944e..8a5201104 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/JeffBeck-NOAA/ccpp-physics + url = https://github.com/NCAR/ccpp-physics branch = bugfix/SPP [submodule "upp"] path = upp From b9781c755bcca9d012b2e70b8605e5875e32b15e Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 20 Apr 2022 15:09:23 +0000 Subject: [PATCH 18/19] Update pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 32b78e439..e2806f0e1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 32b78e4391d1d0d63db92c040d1c252c53c67276 +Subproject commit e2806f0e10431c7c54d77069f36ad9f8d352853a From cd07f75119fa06af4109d1ce89f540c20314eb0b Mon Sep 17 00:00:00 2001 From: jeff beck Date: Wed, 20 Apr 2022 15:42:14 +0000 Subject: [PATCH 19/19] Update ccpp-physics branch to main --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 8a5201104..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics - branch = bugfix/SPP + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP