From 6e4b55e25149fc79169f8cda99c0208408452f50 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Fri, 21 Dec 2018 16:37:54 -0600 Subject: [PATCH 01/17] Adds clubb's c1b and c1c to be read from namelist [BFB] - Bit-For-Bit --- .../cam/src/physics/clubb/parameters_tunable.F90 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/components/cam/src/physics/clubb/parameters_tunable.F90 b/components/cam/src/physics/clubb/parameters_tunable.F90 index 6457744224c6..43857e8f9262 100644 --- a/components/cam/src/physics/clubb/parameters_tunable.F90 +++ b/components/cam/src/physics/clubb/parameters_tunable.F90 @@ -45,6 +45,8 @@ module parameters_tunable real( kind = core_rknd ) :: & clubb_C1, & + clubb_C1b, & + clubb_C1c, & clubb_C2rt, & clubb_C2thl, & clubb_C2rtthl, & @@ -324,6 +326,8 @@ subroutine clubb_param_readnl(filename) namelist /clubb_param_nl/ & clubb_C1, & + clubb_C1b, & + clubb_C1c, & clubb_C2rt, & clubb_C2thl, & clubb_C2rtthl, & @@ -352,6 +356,8 @@ subroutine clubb_param_readnl(filename) ! This is made available for tuning clubb_C1 = init_value + clubb_C1b = init_value + clubb_C1c = init_value clubb_C2rt = init_value clubb_C2thl = init_value clubb_C2rtthl = init_value @@ -387,6 +393,8 @@ subroutine clubb_param_readnl(filename) #ifdef SPMD ! Broadcast namelist variables call mpibcast(clubb_C1, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C1b, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C1c, 1, mpir8, 0, mpicom) call mpibcast(clubb_C2rt, 1, mpir8, 0, mpicom) call mpibcast(clubb_C2thl, 1, mpir8, 0, mpicom) call mpibcast(clubb_C2rtthl, 1, mpir8, 0, mpicom) @@ -819,7 +827,12 @@ subroutine read_parameters( iunit, filename, params ) if (clubb_C1 /= init_value) then C1 = clubb_C1 - C1b = C1 + endif + if (clubb_C1b /= init_value) then + C1b = clubb_C1b + end if + if (clubb_C1c /= init_value) then + C1c = clubb_C1c end if ! if clubb_C2thl and clubb_C2rtthl not specified, continue to use C2thl=C2rt, C2rtthl = 1.3*C2rt ! to preserve existing compsets that have assumed so and only vary C2rt From 185bace39143eed3182b815a67708f9360f3d810 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Mon, 24 Dec 2018 15:07:04 -0600 Subject: [PATCH 02/17] Adds clubb_c1b in all files which had clubb_c1 Adds clubb_c1b=clubb_c1 in all files which had clubb_c1 [BFB] - Bit-For-Bit --- components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml | 1 + .../cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml | 1 + .../cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml | 1 + .../cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml | 1 + .../bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml | 1 + .../cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml | 1 + .../cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml | 1 + 25 files changed, 25 insertions(+) diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml index 8617b68f9de5..b4f8cc6cb812 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml @@ -85,6 +85,7 @@ 2 2.5D-3 1.335 + 1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml index c744ee77377f..acd32290a5a8 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml @@ -85,6 +85,7 @@ 2 2.5D-3 1.335 + 1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml index 6074b4e61fff..d9903e095824 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml index 5f5a2344ed65..619866329cbb 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml index cd928522bb78..85a6848b772b 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml index c8049321738a..4901568096e6 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml @@ -69,6 +69,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml index 36ffbff687ae..333ac5763d3c 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml @@ -70,6 +70,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml index a4a15f819f65..94d05912eb96 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml @@ -87,6 +87,7 @@ 6.0E-6 0.039D0 1.50D0 +1.50D0 4.73D0 1.75D0 6 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml index 27bacf8d9347..1778f54f5def 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml @@ -79,6 +79,7 @@ 2 2.5D-3 1.5 +1.5 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml index cc7c7b55fbc1..7c339d875bb9 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml @@ -85,6 +85,7 @@ 2 2.5D-3 1.335 + 1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml index 34982cc8b1be..785c85074f3d 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml @@ -79,6 +79,7 @@ 2 2.5D-3 1.5 +1.5 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml index 5600daf8f7db..5aa8b239adfa 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml index e49058e3edac..8f6952817af5 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml index dd46e592eb0d..5c64595b4b05 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml index 0e7c6cbb1743..abf8de8c308e 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml @@ -78,6 +78,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml index f31a192186aa..8bca81302bb1 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml @@ -69,6 +69,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml index 31cc705369b3..e49dcc1cdeef 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml @@ -70,6 +70,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml index 60123f56fa1a..ceab94997734 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml @@ -87,6 +87,7 @@ 6.0E-6 0.039D0 1.50D0 +1.50D0 4.73D0 1.75D0 6 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml index 94960e4cd756..d8a70d0e3fc9 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml @@ -82,6 +82,7 @@ 2 2.5D-3 1.335 + 1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml index fc05b697e87c..cca1500d88b7 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml @@ -80,6 +80,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml index b90da3510fbd..4883f3f5bb82 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml @@ -80,6 +80,7 @@ 2 2.5D-3 1.3 +1.3 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml index b1ac234f22a7..f1cdacda3473 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml @@ -80,6 +80,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml index 174f6f40c2f5..e3c3be64a820 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml @@ -74,6 +74,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml index 7f5073ee8394..b622f01606c8 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml @@ -75,6 +75,7 @@ 2 2.5D-3 1.335 +1.335 5.0D0 30500.0D0 3.19D0 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml index 0288170c229b..99bcf6de5759 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml @@ -92,6 +92,7 @@ 6.0E-6 0.039D0 1.50D0 +1.50D0 4.73D0 1.75D0 6 From 2c4149331888211cf79ff973845b044606cb7ef6 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Tue, 25 Dec 2018 01:29:37 -0600 Subject: [PATCH 03/17] Added clubb_c1b definition to namelist_definition.xml clubb_c1b was in usecases but not in the namelist_definitions.xml file. It has to be defined in namelist_definitions.xml for it to appear in atm_in file. [BFB] - Bit-For-Bit --- components/cam/bld/namelist_files/namelist_definition.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/cam/bld/namelist_files/namelist_definition.xml b/components/cam/bld/namelist_files/namelist_definition.xml index 8e612b6ba340..1ec31c23bf1e 100644 --- a/components/cam/bld/namelist_files/namelist_definition.xml +++ b/components/cam/bld/namelist_files/namelist_definition.xml @@ -3055,6 +3055,12 @@ Constant associated with the dissipation of the variance of vertical velocity Default: 1.0. See clubb/parameters_tunable.F90 + +Constant associated with the dissipation of the variance of vertical velocity +Default: 1.0. See clubb/parameters_tunable.F90 + + Constant associated with the dissipation of the variance of total water From 6141747fbab54fb90c89d0b92db49eaace260b6a Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Thu, 27 Dec 2018 17:38:40 -0600 Subject: [PATCH 04/17] Adds compset FC5AV2C so that it is BFB with FC5AV1C-L [BFB] - Bit-For-Bit --- .../mct/cime_config/config_component_e3sm.xml | 1 + .../use_cases/2000_cam5_av2c.xml | 119 ++++++++++++++++++ .../cam/cime_config/config_component.xml | 5 + .../cam/cime_config/config_compsets.xml | 15 +++ 4 files changed, 140 insertions(+) create mode 100644 components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml diff --git a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml index 7557793b50c9..da6f36b07bb6 100644 --- a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml +++ b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml @@ -634,6 +634,7 @@ 368.865 368.865 368.865 + 368.865 368.865 368.865 368.865 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml new file mode 100644 index 000000000000..5c64595b4b05 --- /dev/null +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -0,0 +1,119 @@ + + + + +atm/cam/solar/spectral_irradiance_Lean_1976-2007_ave_c20160517.nc +20000101 +FIXED + + + +1751.022e-9 +315.85e-9 +676.0526e-12 +537.05e-12 + + +.true. +.false. +.false. +.true. +1 + + +.true. +.true. +.false. +2 +.true. +.true. +.true. +.true. +1 + +.true. +.true. + + +.true. +.true. +.true. + + +lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc + + +.true. + + + + 500.0 + 0.045D0 + 16.e-6 + 50.e-6 + 8.e-6 + 10.e-6 + 1.75D0 + 0.007 + 0.007 + -0.7e-3 + 1.5E-6 + 0.25 + 0.85 + 2.05D0 + 0.32 + 4.3 + 1.05D0 + 0.3 + 0.4 + .false. +0.075e-6 +8.0D0 +1.5D0 +0.8D0 +1 +2 +2.5D-3 +1.335 +1.335 +5.0D0 +30500.0D0 +3.19D0 +-1.2D0 +2 +1.3D0 +.true. +.true. +.true. + + + + +atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_2000_c160427.nc + + +atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc + + +3 +1 +'atm/cam/chem/trop_mam/marine_BGC/' +'CYCLICAL' +'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' +0 +0 +'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' + + +atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc +20000101 +FIXED +2000 +linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc +atm/cam/chem/trop_mozart/ub +CYCLICAL + + +2000 + + diff --git a/components/cam/cime_config/config_component.xml b/components/cam/cime_config/config_component.xml index 4d10d2838464..58065168111f 100644 --- a/components/cam/cime_config/config_component.xml +++ b/components/cam/cime_config/config_component.xml @@ -52,6 +52,7 @@ -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 + -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 @@ -166,6 +167,7 @@ 1850_cam5_av1c-04 1850_cam5_av1c-04p 1850_cam5_av1c-04p2 + 1850_cam5_av2c 1850_cam5_av1c-04p2 1850_cam5_av1c-h01a 1850_cam5_av1c-h01b @@ -181,6 +183,7 @@ 2000_cam5_av1c-04 2000_cam5_av1c-04p 2000_cam5_av1c-04p2 + 2000_cam5_av2c 2000_cam5_av1c-04p2 2000_cam5_av1c-04p2_bgc 2000_cam5_av1c-h01a @@ -193,6 +196,7 @@ 20TR_cam5_av1c-04 20TR_cam5_av1c-04p 20TR_cam5_av1c-04p2 + 20TR_cam5_av2c 20TR_cam5_av1c-04p2 20TR_cam5_av1c-04p2_bgc 20TR_cam5_av1c-h01a @@ -285,6 +289,7 @@ CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p2: + CAM with complete set of E3SM atmospheric mods for V2 (72 layers model) and ACES4BGC SOAG emissions: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p2: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- vh01a: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- vh01b: diff --git a/components/cam/cime_config/config_compsets.xml b/components/cam/cime_config/config_compsets.xml index c44dd6c322f8..a0e5026ef03f 100644 --- a/components/cam/cime_config/config_compsets.xml +++ b/components/cam/cime_config/config_compsets.xml @@ -56,6 +56,11 @@ 1850_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + F1850C5AV2C + 1850_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + F1850C5AV1C-L 1850_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV @@ -126,6 +131,11 @@ 2000_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + FC5AV2C + 2000_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + FC5AV1C-L 2000_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV @@ -181,6 +191,11 @@ 20TR_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + F20TRC5AV2C + 20TR_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + F20TRC5AV1C-L 20TR_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV From 0b9b3380ef6efa707c518b47ed0e6591ce97efa6 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Mon, 31 Dec 2018 17:30:21 -0600 Subject: [PATCH 05/17] Temp Commit- adds some vars to use case of new compset [BFB] - Bit-For-Bit --- .../bld/namelist_files/use_cases/2000_cam5_av2c.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml index 5c64595b4b05..a81fb9925798 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 4.3 1.05D0 0.3 @@ -75,7 +76,15 @@ 2 2.5D-3 1.335 -1.335 +2.8 +0.75 +7.50 +0.50 +7.50 +0.50 +0.70 +0.20 +0.85 5.0D0 30500.0D0 3.19D0 From 2ab4e74f3652c88676baff6adca0a2786d17f738 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Wed, 2 Jan 2019 21:57:14 -0600 Subject: [PATCH 06/17] Updates V2 compset with new coefficient, V1 is BFB [BFB] - Bit-For-Bit --- .../namelist_files/namelist_definition.xml | 37 +++++++++++++++++++ .../use_cases/1850_cam5_CMIP6.xml | 1 + .../use_cases/1850_cam5_CMIP6_bgc.xml | 1 + .../use_cases/1850_cam5_av1c-02.xml | 1 + .../use_cases/1850_cam5_av1c-03.xml | 1 + .../use_cases/1850_cam5_av1c-04.xml | 1 + .../use_cases/1850_cam5_av1c-04p.xml | 1 + .../use_cases/1850_cam5_av1c-04p2.xml | 1 + .../use_cases/1850_cam5_av1c-h01a.xml | 1 + .../use_cases/1850_cam5_av1c-h01b.xml | 1 + .../use_cases/1850_cam5_av1c-h01c.xml | 1 + .../use_cases/1950_cam5_CMIP6-HR.xml | 1 + .../use_cases/1950_cam5_CMIP6-LR.xml | 1 + .../use_cases/1950_cam5_CMIP6-LRtunedHR.xml | 1 + .../use_cases/2000_cam5_av1c-02.xml | 1 + .../use_cases/2000_cam5_av1c-03.xml | 1 + .../use_cases/2000_cam5_av1c-04.xml | 1 + .../use_cases/2000_cam5_av1c-04p.xml | 1 + .../use_cases/2000_cam5_av1c-04p2.xml | 1 + .../use_cases/2000_cam5_av1c-04p2_bgc.xml | 1 + .../use_cases/2000_cam5_av1c-h01a.xml | 1 + .../use_cases/2000_cam5_av1c-h01b.xml | 1 + .../use_cases/2000_cam5_av1c-h01c.xml | 1 + .../use_cases/2000_cam5_av2c.xml | 3 +- .../use_cases/20TR_cam5_CMIP6.xml | 1 + .../use_cases/20TR_cam5_CMIP6_bgc.xml | 1 + .../use_cases/20TR_cam5_av1c-03.xml | 1 + .../use_cases/20TR_cam5_av1c-04.xml | 1 + .../use_cases/20TR_cam5_av1c-04p.xml | 1 + .../use_cases/20TR_cam5_av1c-04p2.xml | 1 + .../use_cases/20TR_cam5_av1c-h01a.xml | 1 + .../use_cases/20TR_cam5_av1c-h01b.xml | 1 + .../use_cases/20TR_cam5_av1c-h01c.xml | 1 + .../src/physics/clubb/parameters_tunable.F90 | 36 ++++++++++++++---- 34 files changed, 99 insertions(+), 8 deletions(-) diff --git a/components/cam/bld/namelist_files/namelist_definition.xml b/components/cam/bld/namelist_files/namelist_definition.xml index 1ec31c23bf1e..64821b798651 100644 --- a/components/cam/bld/namelist_files/namelist_definition.xml +++ b/components/cam/bld/namelist_files/namelist_definition.xml @@ -3061,6 +3061,12 @@ Constant associated with the dissipation of the variance of vertical velocity Default: 1.0. See clubb/parameters_tunable.F90 + +Constant associated with the dissipation of the variance of vertical velocity +Default: 1.0. See clubb/parameters_tunable.F90 + + Constant associated with the dissipation of the variance of total water @@ -3091,6 +3097,25 @@ High skewness of Newtonian damping of water flux Default: 6.0 + +High skewness of Newtonian damping of water flux +Default: 1.0 + + + +Low skewness of Newtonian damping of water flux +Default: 1.0 + + + +Low skewness of Newtonian damping of water flux +Default: 6.0 + + + Low skewness of buoyancy damping of water flux @@ -3121,6 +3146,12 @@ High skewnes of buoyancy damping of the third moment of vertical velocity Default: 0.35 + +High skewnes of buoyancy damping of the third moment of vertical velocity +Default: 0.5 + + Constant of Newtonian damping of the variances of u-wind and v-wind @@ -3145,6 +3176,12 @@ High Skw. gamma coef. Skw. Fnct. Default: 0.32 or clubb_gamma_coef if it is specified + +High Skw. gamma coef. Skw. Fnct. +Default: 5.0or clubb_gamma_coef if it is specified + + Fractional parcel entrainment rate per unit height (1/m) diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml index b4f8cc6cb812..730bccce770d 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml @@ -72,6 +72,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml index acd32290a5a8..5fdd09dfcbda 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml @@ -72,6 +72,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-02.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-02.xml index aee441381c56..fc4e23b079d9 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-02.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-02.xml @@ -62,6 +62,7 @@ 0.7 2.05D0 0.25 + 0.25 5.2 1.1D0 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-03.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-03.xml index 54fe0e61f2c4..c7b0de4cbb15 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-03.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-03.xml @@ -63,6 +63,7 @@ 1.05 2.05D0 0.29 + 0.29 5.2 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml index d9903e095824..d93c84886948 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml index 619866329cbb..f082c721b7a7 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml index 85a6848b772b..d6136a474c1b 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml index 4901568096e6..6e45ca7fe22e 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01a.xml @@ -57,6 +57,7 @@ 0.85 2.05D0 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml index 333ac5763d3c..cc3243a282db 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01b.xml @@ -57,6 +57,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml index 94d05912eb96..5dfbc6531577 100644 --- a/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/1850_cam5_av1c-h01c.xml @@ -55,6 +55,7 @@ 0.25 0.85 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml index 1778f54f5def..33f75adc6854 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml @@ -67,6 +67,7 @@ 0.85 2.5D0 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml index 7c339d875bb9..2f340e43ec37 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml @@ -72,6 +72,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml index 785c85074f3d..5ed8a7ba6ace 100644 --- a/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml +++ b/components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml @@ -67,6 +67,7 @@ 0.85 2.5D0 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-02.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-02.xml index edbce5d06603..7e00c9ee8208 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-02.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-02.xml @@ -50,6 +50,7 @@ 0.7 2.05D0 0.25 + 0.25 5.2 1.1D0 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-03.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-03.xml index 159a1deda091..ac1c254f575b 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-03.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-03.xml @@ -63,6 +63,7 @@ 1.05 2.05D0 0.29 + 0.29 5.2 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml index 5aa8b239adfa..5ac0f5dae0fd 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml index 8f6952817af5..8264f8ecbe5d 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml index 5c64595b4b05..3e193544cf45 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml index abf8de8c308e..4c64a0e954f4 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml @@ -65,6 +65,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml index 8bca81302bb1..1f89149e8893 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml @@ -57,6 +57,7 @@ 0.85 2.05D0 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml index e49dcc1cdeef..8ac619152bac 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01b.xml @@ -57,6 +57,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml index ceab94997734..87f8da25fcbb 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-h01c.xml @@ -55,6 +55,7 @@ 0.25 0.85 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml index a81fb9925798..0a3adae8d0b8 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -62,7 +62,8 @@ 0.85 2.05D0 0.32 - + 0.32 +1.2 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6.xml index 38bafc0fa021..ace5b7f321ed 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6.xml @@ -69,6 +69,7 @@ 0.85 2.05D0 0.32 +0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml index d8a70d0e3fc9..e8ecf5f078b7 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml @@ -69,6 +69,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-03.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-03.xml index 19f158e250ec..55bd3c8c49c9 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-03.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-03.xml @@ -67,6 +67,7 @@ 1.05 2.05D0 0.29 + 0.29 5.2 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml index cca1500d88b7..09667c0323ff 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04.xml @@ -67,6 +67,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml index 4883f3f5bb82..c56eb511b22a 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p.xml @@ -67,6 +67,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml index f1cdacda3473..98d036b49d34 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml @@ -67,6 +67,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml index e3c3be64a820..45531034e515 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01a.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml index b622f01606c8..36ae9ac76656 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01b.xml @@ -62,6 +62,7 @@ 0.85 2.05D0 0.32 + 0.32 4.3 1.05D0 0.3 diff --git a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml index 99bcf6de5759..b2346c099e3f 100644 --- a/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml +++ b/components/cam/bld/namelist_files/use_cases/20TR_cam5_av1c-h01c.xml @@ -60,6 +60,7 @@ 0.25 0.85 0.32 + 0.32 1.05D0 0.3 0.4 diff --git a/components/cam/src/physics/clubb/parameters_tunable.F90 b/components/cam/src/physics/clubb/parameters_tunable.F90 index 43857e8f9262..ab916a771ed7 100644 --- a/components/cam/src/physics/clubb/parameters_tunable.F90 +++ b/components/cam/src/physics/clubb/parameters_tunable.F90 @@ -52,15 +52,20 @@ module parameters_tunable clubb_C2rtthl, & clubb_C6rt, & clubb_C6rtb, & + clubb_C6rtc, & + clubb_C6thlb, & + clubb_C6thlc, & clubb_C7, & clubb_C7b, & clubb_C8, & clubb_C11, & clubb_C11b, & + clubb_C11c, & clubb_C14, & clubb_beta, & clubb_gamma_coef, & clubb_gamma_coefb, & + clubb_gamma_coefc, & clubb_mu, & clubb_nu1, & clubb_c_K10, & @@ -333,15 +338,20 @@ subroutine clubb_param_readnl(filename) clubb_C2rtthl, & clubb_C6rt, & clubb_C6rtb, & + clubb_C6rtc, & + clubb_C6thlb, & + clubb_C6thlc, & clubb_C7, & clubb_C7b, & clubb_C8, & clubb_C11, & clubb_C11b, & + clubb_C11c, & clubb_C14, & clubb_beta, & clubb_gamma_coef, & clubb_gamma_coefb, & + clubb_gamma_coefc, & clubb_mu, & clubb_nu1, & clubb_c_K10, & @@ -363,15 +373,20 @@ subroutine clubb_param_readnl(filename) clubb_C2rtthl = init_value clubb_C6rt = init_value clubb_C6rtb = init_value + clubb_C6rtc = init_value + clubb_C6thlb = init_value + clubb_C6thlc = init_value clubb_C7 = init_value clubb_C7b = init_value clubb_C8 = init_value clubb_C11 = init_value clubb_C11b = init_value + clubb_C11c = init_value clubb_C14 = init_value clubb_beta = init_value clubb_gamma_coef = init_value clubb_gamma_coefb = init_value + clubb_gamma_coefc = init_value clubb_mu = init_value clubb_nu1 = init_value clubb_c_K10 = init_value @@ -400,15 +415,20 @@ subroutine clubb_param_readnl(filename) call mpibcast(clubb_C2rtthl, 1, mpir8, 0, mpicom) call mpibcast(clubb_C6rt, 1, mpir8, 0, mpicom) call mpibcast(clubb_C6rtb, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C6rtc, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C6thlb, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C6thlc, 1, mpir8, 0, mpicom) call mpibcast(clubb_C7, 1, mpir8, 0, mpicom) call mpibcast(clubb_C7b, 1, mpir8, 0, mpicom) call mpibcast(clubb_C8, 1, mpir8, 0, mpicom) call mpibcast(clubb_C11, 1, mpir8, 0, mpicom) call mpibcast(clubb_C11b, 1, mpir8, 0, mpicom) + call mpibcast(clubb_C11c, 1, mpir8, 0, mpicom) call mpibcast(clubb_C14, 1, mpir8, 0, mpicom) call mpibcast(clubb_beta, 1, mpir8, 0, mpicom) call mpibcast(clubb_gamma_coef, 1, mpir8, 0, mpicom) call mpibcast(clubb_gamma_coefb,1, mpir8, 0, mpicom) + call mpibcast(clubb_gamma_coefc,1, mpir8, 0, mpicom) call mpibcast(clubb_mu, 1, mpir8, 0, mpicom) call mpibcast(clubb_nu1, 1, mpir8, 0, mpicom) call mpibcast(clubb_c_K10, 1, mpir8, 0, mpicom) @@ -849,21 +869,23 @@ subroutine read_parameters( iunit, filename, params ) C6thl = C6rt end if if (clubb_C6rtb /= init_value) C6rtb = clubb_C6rtb + if (clubb_C6rtc /= init_value) C6rtc = clubb_C6rtc + if (clubb_C6thlb /= init_value) C6thlb = clubb_C6thlb + if (clubb_C6thlc /= init_value) C6thlc = clubb_C6thlc if (clubb_C7 /= init_value) C7 = clubb_C7 if (clubb_C7b /= init_value) C7b = clubb_C7b if (clubb_C8 /= init_value) C8 = clubb_C8 if (clubb_C11 /= init_value) C11 = clubb_C11 if (clubb_C11b /= init_value) C11b = clubb_C11b + if (clubb_C11c /= init_value) C11c = clubb_C11c if (clubb_C14 /= init_value) C14 = clubb_C14 if (clubb_beta /= init_value) beta = clubb_beta - ! if clubb_gamma_coefb not specified, continue to use gamma_coefb=gamma_coef - ! to preserve existing compsets that have assumed so and only vary gamma_coef - if (clubb_gamma_coef /= init_value) then - gamma_coef = clubb_gamma_coef - if (clubb_gamma_coefb == init_value) gamma_coefb = gamma_coef - end if - ! Allows gamma_coefb to vary separately + if (clubb_gamma_coef /= init_value) gamma_coef = clubb_gamma_coef if (clubb_gamma_coefb /= init_value) gamma_coefb = clubb_gamma_coefb + if (clubb_gamma_coefc /= init_value) gamma_coefc = clubb_gamma_coefc + + ! Allows gamma_coefb to vary separately + if (clubb_gamma_coefb /= init_value) gamma_coefb = clubb_gamma_coefb !why is this repeated? if (clubb_mu /= init_value) mu = clubb_mu if (clubb_nu1 /= init_value) nu1 = clubb_nu1 if (clubb_c_K10 /= init_value) c_K10 = clubb_c_K10 From f5fc360b61f4f4f7b07a7d02c704776612895b8c Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Wed, 6 Feb 2019 16:19:29 -0600 Subject: [PATCH 07/17] Modifies use case for v2 compset to match po-lin's case [BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags. --- .../use_cases/2000_cam5_av2c.xml | 68 +++++++++++++------ 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml index 0a3adae8d0b8..9f1d016ca874 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -47,36 +47,39 @@ - 500.0 - 0.045D0 - 16.e-6 + 1200.0 + 0.018D0 + 1.8D0 + 14.e-6 50.e-6 8.e-6 10.e-6 1.75D0 - 0.007 - 0.007 - -0.7e-3 - 1.5E-6 + 0.0020 + 0.0020 + -1.2e-3 + 5.0E-6 + 0.14D0 0.25 - 0.85 - 2.05D0 - 0.32 - 0.32 + 0.6 + 2.8D0 + 0.12D0 + 0.28D0 1.2 - 4.3 + 5.2 1.05D0 - 0.3 + 0.35 0.4 .false. -0.075e-6 +0.080e-6 8.0D0 -1.5D0 +1.75D0 +0.7D0 0.8D0 1 -2 +1 2.5D-3 -1.335 +2.4 2.8 0.75 7.50 @@ -86,25 +89,48 @@ 0.70 0.20 0.85 +0.0005 + 100.0D0 5.0D0 30500.0D0 3.19D0 --1.2D0 +-1.40D0 2 -1.3D0 +2.0D0 .true. .true. .true. + + + + -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_2000_c160427.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_soag_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_elev_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc +atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_surf_1850-2014_c180205.nc +atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_surf_1850-2014_c180205.nc + 3 1 'atm/cam/chem/trop_mam/marine_BGC/' From cd338b91c07471705a387c43e841c414e0cf9056 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Thu, 14 Feb 2019 19:01:28 -0600 Subject: [PATCH 08/17] Adds clubb_use_sgv to use case for av2c --- components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml index 9f1d016ca874..5f34905d0c5c 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -55,6 +55,7 @@ 8.e-6 10.e-6 1.75D0 + .true. 0.0020 0.0020 -1.2e-3 From 3382111c0852e593dc147a82a20dbfc851f70369 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Wed, 20 Feb 2019 17:41:54 -0600 Subject: [PATCH 09/17] Adds vmag_gust to infld calls in physpkg.F90 [BFB] - Bit-For-Bit --- components/cam/src/physics/cam/physpkg.F90 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/components/cam/src/physics/cam/physpkg.F90 b/components/cam/src/physics/cam/physpkg.F90 index a11829406d64..0ef1fc00ed07 100644 --- a/components/cam/src/physics/cam/physpkg.F90 +++ b/components/cam/src/physics/cam/physpkg.F90 @@ -430,6 +430,17 @@ subroutine phys_inidat( cam_out, pbuf2d ) tpert_idx = pbuf_get_index( 'tpert') call pbuf_set_field(pbuf2d, tpert_idx, tptr) + + call infld('vmag_gust', fh_ini, dim1name, dim2name, 1, pcols, begchunk, endchunk, & + tptr(:,:), found, gridname='physgrid') + if(.not. found) then + tptr(:,:) = 1._r8 + if (masterproc) write(iulog,*) 'vmag_gust initialized to 1.' + end if + vmag_gust_idx = pbuf_get_index( 'vmag_gust') + call pbuf_set_field(pbuf2d, vmag_gust_idx, tptr) + + fieldname='QPERT' qpert_idx = pbuf_get_index( 'qpert',ierr) if (qpert_idx > 0) then From 4f7ef9f2cd600535c55adbc3742639ee56de1cd6 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Wed, 20 Feb 2019 18:04:36 -0600 Subject: [PATCH 10/17] defines missing variable for pbuf id for vmag_gust [BFB] - Bit-For-Bit --- components/cam/src/physics/cam/physpkg.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cam/src/physics/cam/physpkg.F90 b/components/cam/src/physics/cam/physpkg.F90 index 0ef1fc00ed07..a57ccfab8f10 100644 --- a/components/cam/src/physics/cam/physpkg.F90 +++ b/components/cam/src/physics/cam/physpkg.F90 @@ -362,7 +362,7 @@ subroutine phys_inidat( cam_out, pbuf2d ) real(r8), pointer :: qpert(:,:) character*11 :: subname='phys_inidat' ! subroutine name - integer :: tpert_idx, qpert_idx, pblh_idx + integer :: tpert_idx, qpert_idx, pblh_idx, vmag_gust_idx logical :: found=.false., found2=.false. integer :: ierr From 85789d666ded3ca3991607383c8341ed0bdc3c9f Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Mon, 25 Feb 2019 16:41:21 -0600 Subject: [PATCH 11/17] Adds zmconv_tp_fac value for av2c use case [BFB] - Bit-For-Bit [FCC] - Flag Climate Changing [Non-BFB] - Non Bit-For-Bit [CC] - Climate Changing [NML] - Namelist Changing See confluence for a more detailed description about these tags. --- components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml index 5f34905d0c5c..5de88b830193 100644 --- a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml +++ b/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml @@ -61,6 +61,7 @@ -1.2e-3 5.0E-6 0.14D0 + 2.0D0 0.25 0.6 2.8D0 From f9a6059b80d8cff9ff908ae93bcf8c8ca0c8b92a Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Fri, 8 Mar 2019 13:45:29 -0600 Subject: [PATCH 12/17] Fixes bug where tp_fac was not broadcasted [BFB] - Bit-For-Bit --- components/cam/src/physics/cam/clubb_intr.F90 | 33 ++++++++++--------- components/cam/src/physics/cam/zm_conv.F90 | 1 + 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/components/cam/src/physics/cam/clubb_intr.F90 b/components/cam/src/physics/cam/clubb_intr.F90 index 9cf28ba8dc5d..26e71aa86e65 100644 --- a/components/cam/src/physics/cam/clubb_intr.F90 +++ b/components/cam/src/physics/cam/clubb_intr.F90 @@ -2500,36 +2500,37 @@ subroutine clubb_tend_cam( & !PMA adds gustiness and tpert - vmag_gust(:) = 1._r8 + vmag_gust(:) = 0._r8 vmag_gust_dp(:) = 0._r8 vmag_gust_cl(:) = 0._r8 ktopi(:) = pver if (use_sgv) then do i=1,ncol - up2b(i) = up2(i,pver) - vp2b(i) = vp2(i,pver) - umb(i) = abs(state1%u(i,pver)) - vmb(i) = abs(state1%v(i,pver)) - prec_gust(i) = max(0._r8,prec_dp(i)-snow_dp(i))*1.e3_r8 - if (cam_in%landfrac(i).gt.0.95_r8) then + up2b(i) = up2(i,pver) + vp2b(i) = vp2(i,pver) + umb(i) = state1%u(i,pver) + vmb(i) = state1%v(i,pver) + prec_gust(i) = max(0._r8,prec_dp(i)-snow_dp(i))*1.e3_r8 + if (cam_in%landfrac(i).gt.0.95_r8) then gust_fac(i) = gust_facl - else + else gust_fac(i) = gust_faco - endif - vmag(i) = max(1.e-5_r8,sqrt( umb(i)**2._r8 + vmb(i)**2._r8)) - vmag_gust_dp(i) = ugust(min(prec_gust(i),6.94444e-4_r8),gust_fac(i)) ! Limit for the ZM gustiness equation set in Redelsperger et al. (2000) - vmag_gust_dp(i) = max(0._r8, vmag_gust_dp(i) / vmag(i)) - vmag_gust_cl(i) = gust_facc*(sqrt(max(0._r8,up2b(i)+vp2b(i))+vmag(i)**2._r8)-vmag(i)) - vmag_gust_cl(i) = max(0._r8, vmag_gust_cl(i) / vmag(i)) - vmag_gust(i) = 1._r8 + vmag_gust_cl(i) + vmag_gust_dp(i) + endif + vmag(i) = max(1.e-5_r8,sqrt( umb(i)**2._r8 + vmb(i)**2._r8)) + vmag_gust_dp(i) = ugust(min(prec_gust(i),6.94444e-4_r8),gust_fac(i)) ! Limit for the ZM gustiness equation set in Redelsperger et al. (2000) + vmag_gust_dp(i) = max(0._r8, vmag_gust_dp(i) )!/ vmag(i)) + vmag_gust_cl(i) = gust_facc*(sqrt(max(0._r8,up2b(i)+vp2b(i))+vmag(i)**2._r8)-vmag(i)) + vmag_gust_cl(i) = max(0._r8, vmag_gust_cl(i) )!/ vmag(i)) + vmag_gust(i) = vmag_gust_cl(i) + vmag_gust_dp(i) do k=1,pver if (state1%zi(i,k)>pblh(i).and.state1%zi(i,k+1)<=pblh(i)) then ktopi(i) = k exit end if end do - tpert(i) = min(2._r8,sqrt(thlp2(i,ktopi(i))/max(state1%exner(i,ktopi(i)),1.e-3_r8))) + tpert(i) = min(2._r8,(sqrt(thlp2(i,ktopi(i)))+(latvap/cpair)*state1%q(i,ktopi(i),ixcldliq)) & + /max(state1%exner(i,ktopi(i)),1.e-3_r8)) !proxy for tpert end do end if diff --git a/components/cam/src/physics/cam/zm_conv.F90 b/components/cam/src/physics/cam/zm_conv.F90 index 22022a182e95..2ae705ec525f 100644 --- a/components/cam/src/physics/cam/zm_conv.F90 +++ b/components/cam/src/physics/cam/zm_conv.F90 @@ -156,6 +156,7 @@ subroutine zmconv_readnl(nlfile) call mpibcast(tiedke_add, 1, mpir8, 0, mpicom) call mpibcast(num_cin, 1, mpiint, 0, mpicom) call mpibcast(mx_bot_lyr_adj, 1, mpiint, 0, mpicom) + call mpibcast(tp_fac, 1, mpir8, 0, mpicom) #endif end subroutine zmconv_readnl From 72ee6aeb2f2bff3f9d5be873b9b5d4115db0c29a Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Fri, 8 Mar 2019 13:52:33 -0600 Subject: [PATCH 13/17] Adds a testmod directory for gustiness --- .../testmods_dirs/cam/gust_param/user_nl_cam | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 components/cam/cime_config/testdefs/testmods_dirs/cam/gust_param/user_nl_cam diff --git a/components/cam/cime_config/testdefs/testmods_dirs/cam/gust_param/user_nl_cam b/components/cam/cime_config/testdefs/testmods_dirs/cam/gust_param/user_nl_cam new file mode 100644 index 000000000000..df3525cf1e39 --- /dev/null +++ b/components/cam/cime_config/testdefs/testmods_dirs/cam/gust_param/user_nl_cam @@ -0,0 +1,62 @@ +seasalt_emis_scale = 0.6 +cldfrc_dp1 = 0.018D0 +clubb_c1 = 2.4 +clubb_c11 = 0.70 +clubb_c11b = 0.20 +clubb_c11c = 0.85 +clubb_c14 = 2.0D0 +clubb_c1b = 2.8 +clubb_c1c = 0.75 + +clubb_c6rtb = 7.50 +clubb_c6rtc = 0.50 +clubb_c6thlb = 7.50 +clubb_c6thlc = 0.50 +clubb_c8 = 5.2 +clubb_c_k10 = 0.35 +clubb_gamma_coef = 0.12D0 +clubb_gamma_coefb = 0.28D0 +clubb_gamma_coefc = 1.2 +clubb_mu = 0.0005 +clubb_wpxp_l_thresh = 100.0D0 + + +clubb_ice_deep = 14.e-6 +clubb_use_sgv = .true. +dust_emis_fact = 2.8D0 + +ice_sed_ai = 1200.0 +micro_mg_berg_eff_factor = 0.7D0 +so4_sz_thresh_icenuc = 0.080e-6 +cld_sed = 1.8D0 +micro_mg_accre_enhan_fac = 1.75D0 +prc_exp1 = -1.40D0 +zmconv_alfa = 0.14D0 +zmconv_c0_lnd = 0.0020 +zmconv_c0_ocn = 0.0020 +zmconv_dmpdz = -1.2e-3 +zmconv_ke = 5.0E-6 +zmconv_mx_bot_lyr_adj = 1 + +zmconv_tp_fac = 2.0D0 + +ext_frc_specifier = 'SO2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_elev_1850-2014_c180205.nc', + 'SOAG -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_soag_elev_1850-2014_c180205.nc', + 'bc_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_elev_1850-2014_c180205.nc', + 'num_a1 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_elev_1850-2014_c180205.nc', + 'num_a2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_elev_1850-2014_c180205.nc', + 'num_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_elev_1850-2014_c180205.nc', + 'pom_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_elev_1850-2014_c180205.nc', + 'so4_a1 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_elev_1850-2014_c180205.nc', + 'so4_a2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_elev_1850-2014_c180205.nc' + + +srf_emis_specifier = 'DMS -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc', + 'SO2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_surf_1850-2014_c180205.nc', + 'bc_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_surf_1850-2014_c180205.nc', + 'num_a1 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_surf_1850-2014_c180205.nc', + 'num_a2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_surf_1850-2014_c180205.nc', + 'num_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_surf_1850-2014_c180205.nc', + 'pom_a4 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_surf_1850-2014_c180205.nc', + 'so4_a1 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_surf_1850-2014_c180205.nc', + 'so4_a2 -> $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_surf_1850-2014_c180205.nc' From f1a4ead5e8874eaff315353f29a7f55b604cf361 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Fri, 8 Mar 2019 15:53:57 -0600 Subject: [PATCH 14/17] Removes av2c compset and renames av2c use case file [BFB] - Bit-For-Bit --- .../mct/cime_config/config_component_e3sm.xml | 1 - ...cam5_av2c.xml => 2000_cam5_av1c-04p2_gust.xml} | 0 components/cam/cime_config/config_component.xml | 5 ----- components/cam/cime_config/config_compsets.xml | 15 --------------- 4 files changed, 21 deletions(-) rename components/cam/bld/namelist_files/use_cases/{2000_cam5_av2c.xml => 2000_cam5_av1c-04p2_gust.xml} (100%) diff --git a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml index da6f36b07bb6..7557793b50c9 100644 --- a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml +++ b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml @@ -634,7 +634,6 @@ 368.865 368.865 368.865 - 368.865 368.865 368.865 368.865 diff --git a/components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml b/components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml similarity index 100% rename from components/cam/bld/namelist_files/use_cases/2000_cam5_av2c.xml rename to components/cam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml diff --git a/components/cam/cime_config/config_component.xml b/components/cam/cime_config/config_component.xml index 58065168111f..4d10d2838464 100644 --- a/components/cam/cime_config/config_component.xml +++ b/components/cam/cime_config/config_component.xml @@ -52,7 +52,6 @@ -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 - -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 @@ -167,7 +166,6 @@ 1850_cam5_av1c-04 1850_cam5_av1c-04p 1850_cam5_av1c-04p2 - 1850_cam5_av2c 1850_cam5_av1c-04p2 1850_cam5_av1c-h01a 1850_cam5_av1c-h01b @@ -183,7 +181,6 @@ 2000_cam5_av1c-04 2000_cam5_av1c-04p 2000_cam5_av1c-04p2 - 2000_cam5_av2c 2000_cam5_av1c-04p2 2000_cam5_av1c-04p2_bgc 2000_cam5_av1c-h01a @@ -196,7 +193,6 @@ 20TR_cam5_av1c-04 20TR_cam5_av1c-04p 20TR_cam5_av1c-04p2 - 20TR_cam5_av2c 20TR_cam5_av1c-04p2 20TR_cam5_av1c-04p2_bgc 20TR_cam5_av1c-h01a @@ -289,7 +285,6 @@ CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p2: - CAM with complete set of E3SM atmospheric mods for V2 (72 layers model) and ACES4BGC SOAG emissions: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v04p2: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- vh01a: CAM with complete set of E3SM atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- vh01b: diff --git a/components/cam/cime_config/config_compsets.xml b/components/cam/cime_config/config_compsets.xml index a0e5026ef03f..c44dd6c322f8 100644 --- a/components/cam/cime_config/config_compsets.xml +++ b/components/cam/cime_config/config_compsets.xml @@ -56,11 +56,6 @@ 1850_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - F1850C5AV2C - 1850_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - F1850C5AV1C-L 1850_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV @@ -131,11 +126,6 @@ 2000_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - FC5AV2C - 2000_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - FC5AV1C-L 2000_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV @@ -191,11 +181,6 @@ 20TR_CAM5%AV1C-04P2_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - F20TRC5AV2C - 20TR_CAM5%AV2C_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - F20TRC5AV1C-L 20TR_CAM5%AV1C-L_CLM45%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV From 2aa9cdea6c1fdac9edf386efbf1c977c1c40e9b1 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Sat, 9 Mar 2019 19:00:46 -0600 Subject: [PATCH 15/17] Adds a test for gustiness feature in integration testing --- cime/config/e3sm/tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cime/config/e3sm/tests.py b/cime/config/e3sm/tests.py index 30e20ee77927..8d85b60f89a2 100644 --- a/cime/config/e3sm/tests.py +++ b/cime/config/e3sm/tests.py @@ -43,6 +43,7 @@ "PEM_Ln5.ne4_ne4.FC5AV1C-L", ("SMS_D_Ln5.ne4_ne4.FC5AV1C-L", "cam-cosplite_nhtfrq5"), ("ERS_Ld5.ne4_ne4.FC5AV1C-L", "cam-rrtmgp"), + ("ERS_Ld5.ne4_ne4.FC5AV1C-L", "cam-gust_param"), "REP_Ln5.ne4_ne4.FC5AV1C-L") ), #atmopheric tests for extra coverage From 4ecc855476e200e1d76a3e675ed26cff5bd13341 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Mon, 11 Mar 2019 12:34:31 -0500 Subject: [PATCH 16/17] initializes vmag_gust to 0. in physpkg.F90 --- components/cam/src/physics/cam/physpkg.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cam/src/physics/cam/physpkg.F90 b/components/cam/src/physics/cam/physpkg.F90 index a57ccfab8f10..8ff6ff0375c0 100644 --- a/components/cam/src/physics/cam/physpkg.F90 +++ b/components/cam/src/physics/cam/physpkg.F90 @@ -434,7 +434,7 @@ subroutine phys_inidat( cam_out, pbuf2d ) call infld('vmag_gust', fh_ini, dim1name, dim2name, 1, pcols, begchunk, endchunk, & tptr(:,:), found, gridname='physgrid') if(.not. found) then - tptr(:,:) = 1._r8 + tptr(:,:) = 0._r8 if (masterproc) write(iulog,*) 'vmag_gust initialized to 1.' end if vmag_gust_idx = pbuf_get_index( 'vmag_gust') From 4f0fb8a69c825e7e50e22668405b3a12d325cb65 Mon Sep 17 00:00:00 2001 From: Balwinder Singh Date: Mon, 11 Mar 2019 12:58:31 -0500 Subject: [PATCH 17/17] Adds missed changes to cam_export in camsrfexch.F90 --- components/cam/src/control/camsrfexch.F90 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/cam/src/control/camsrfexch.F90 b/components/cam/src/control/camsrfexch.F90 index 4f892d1192e0..66ebc575c896 100644 --- a/components/cam/src/control/camsrfexch.F90 +++ b/components/cam/src/control/camsrfexch.F90 @@ -426,6 +426,7 @@ subroutine cam_export(state,cam_out,pbuf) integer :: prec_dp_idx, snow_dp_idx, prec_sh_idx, snow_sh_idx integer :: prec_sed_idx,snow_sed_idx,prec_pcw_idx,snow_pcw_idx integer :: vmag_gust_idx + real(r8) :: umb(pcols), vmb(pcols),vmag(pcols) real(r8), pointer :: prec_dp(:) ! total precipitation from ZM convection real(r8), pointer :: snow_dp(:) ! snow from ZM convection @@ -465,11 +466,14 @@ subroutine cam_export(state,cam_out,pbuf) !PMA adds gustiness to surface scheme c20181128 do i=1,ncol + umb(i) = state%u(i,pver) + vmb(i) = state%v(i,pver) + vmag(i) = max(1.e-5_r8,sqrt( umb(i)**2._r8 + vmb(i)**2._r8)) cam_out%tbot(i) = state%t(i,pver) cam_out%thbot(i) = state%t(i,pver) * state%exner(i,pver) cam_out%zbot(i) = state%zm(i,pver) - cam_out%ubot(i) = state%u(i,pver) * vmag_gust(i) - cam_out%vbot(i) = state%v(i,pver) * vmag_gust(i) + cam_out%ubot(i) = state%u(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i) + cam_out%vbot(i) = state%v(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i) cam_out%pbot(i) = state%pmid(i,pver) cam_out%rho(i) = cam_out%pbot(i)/(rair*cam_out%tbot(i)) psm1(i,lchnk) = state%ps(i)