From b74950f69d3ea44a55ffbbd0d700afff178a05e0 Mon Sep 17 00:00:00 2001 From: adamrher Date: Thu, 23 May 2024 11:55:12 -0600 Subject: [PATCH 1/9] replaced L93 ncdata files w/ corrected versions --- bld/namelist_files/namelist_defaults_cam.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 331863e4e2..fb3dc48f22 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -125,10 +125,10 @@ atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc atm/cam/inic/se/f.e22.FCnudged.ne30_ne30_mg17.release-cesm2.2.0_spinup.2010_2020.001.cam.i.2011-01-01-00000_L58_c220310.nc -atm/cam/inic/se/f.cam6_3_112.FCMTHIST_v0c.ne30.non-ogw-ubcT-effgw0.7.001.cam.i.1998-01-01-00000_c230810.nc +/glade/derecho/scratch/aherring/restart/L93v2/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000.nc atm/cam/inic/se/FLT_L58_ne30pg3_IC_c220623.nc -atm/cam/inic/se/cam7_FMT_ne30pg3_mg17_L93_c221118.nc +/glade/derecho/scratch/aherring/restart/L93v2/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000.nc atm/cam/chem/trop_mozart/ic/cami_0000-09-01_4x5_L26_c060217.nc atm/cam/chem/trop_mozart/ic/cami_0000-09-01_10x15_L26_c060216.nc @@ -220,7 +220,7 @@ atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L32_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L58_01-01-31_c221214.nc -atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L93_01-01-31_c221214.nc +/glade/derecho/scratch/aherring/restart/L93v2/cam6_3_153_FMTHIST_ne3pg3_ne3pg3_mg37_36pes_240517_L93v2.001.cam.i.1979-02-01-00000.nc atm/cam/inic/homme/cami-mam3_0000-01_ne5np4_L30.140707.nc atm/cam/inic/se/F2000climo_ne5pg3_mg37_L32_01-01-31_c230520.nc atm/cam/inic/se/F2000climo_ne5pg3_mg37_L58_01-01-31_c230520.nc @@ -255,7 +255,7 @@ atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.nc -atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01-01-31_c221214.nc +/glade/derecho/scratch/aherring/restart/L93v2/cam6_3_153_QPC6_ne3pg3_ne3pg3_mg37_36pes_240518_L93v2.001.cam.i.0001-02-01-00000.nc atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc From c76155113fb36a99ef32657fd4b205a6ea82902d Mon Sep 17 00:00:00 2001 From: jtruesdal Date: Mon, 24 Jun 2024 11:58:50 -0600 Subject: [PATCH 2/9] Update bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index fb3dc48f22..2e0d436aa6 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -255,7 +255,7 @@ atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.nc -/glade/derecho/scratch/aherring/restart/L93v2/cam6_3_153_QPC6_ne3pg3_ne3pg3_mg37_36pes_240518_L93v2.001.cam.i.0001-02-01-00000.nc +atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc From 18573a17b63f8e2956b43fe2f3fcd080e3e16768 Mon Sep 17 00:00:00 2001 From: jtruesdal Date: Mon, 24 Jun 2024 11:59:10 -0600 Subject: [PATCH 3/9] Update bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 2e0d436aa6..d93f7d6863 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -220,7 +220,7 @@ atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L32_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L58_01-01-31_c221214.nc -/glade/derecho/scratch/aherring/restart/L93v2/cam6_3_153_FMTHIST_ne3pg3_ne3pg3_mg37_36pes_240517_L93v2.001.cam.i.1979-02-01-00000.nc +atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc atm/cam/inic/homme/cami-mam3_0000-01_ne5np4_L30.140707.nc atm/cam/inic/se/F2000climo_ne5pg3_mg37_L32_01-01-31_c230520.nc atm/cam/inic/se/F2000climo_ne5pg3_mg37_L58_01-01-31_c230520.nc From 0de66f5c7dcd928f66a1e72e7836bcac85497cd0 Mon Sep 17 00:00:00 2001 From: jtruesdal Date: Mon, 24 Jun 2024 11:59:16 -0600 Subject: [PATCH 4/9] Update bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index d93f7d6863..539c2aa141 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -125,7 +125,7 @@ atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc atm/cam/inic/se/f.e22.FCnudged.ne30_ne30_mg17.release-cesm2.2.0_spinup.2010_2020.001.cam.i.2011-01-01-00000_L58_c220310.nc -/glade/derecho/scratch/aherring/restart/L93v2/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000.nc +atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc atm/cam/inic/se/FLT_L58_ne30pg3_IC_c220623.nc /glade/derecho/scratch/aherring/restart/L93v2/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000.nc From bd8f4228bdd102cf9f912ad86d718d76edccea1a Mon Sep 17 00:00:00 2001 From: jtruesdal Date: Mon, 24 Jun 2024 11:59:28 -0600 Subject: [PATCH 5/9] Update bld/namelist_files/namelist_defaults_cam.xml --- bld/namelist_files/namelist_defaults_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 539c2aa141..08da13b21d 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -128,7 +128,7 @@ atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc atm/cam/inic/se/FLT_L58_ne30pg3_IC_c220623.nc -/glade/derecho/scratch/aherring/restart/L93v2/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000.nc +atm/cam/inic/se/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000_c240618.nc atm/cam/chem/trop_mozart/ic/cami_0000-09-01_4x5_L26_c060217.nc atm/cam/chem/trop_mozart/ic/cami_0000-09-01_10x15_L26_c060216.nc From 3d5dc1f814b92f5b2b584adcee6fa5a9fa8acdf5 Mon Sep 17 00:00:00 2001 From: John Truesdale Date: Fri, 28 Jun 2024 11:09:14 -0600 Subject: [PATCH 6/9] add Changelog --- doc/ChangeLog | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 78cd2e72fb..67aa8f5f84 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,80 @@ =============================================================== +Tag name: cam6_4_003 +Originator(s): adamrher, jet +Date: Thu Jun 27, 2024 +One-line Summary: Corrected L93 default IC files +Github PR URL: https://github.com/ESCOMP/CAM/pull/1040 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +Resolves #1034 - Problematic hybrid coefficients in L99 + +. The fix is to correct the hybrid coefficients and make a new run + +Describe any changes made to build system: none + +Describe any changes made to the namelist: none + +List any changes to the defaults for the boundary datasets: Files with problematic hybrid coeff were + regenerated. + +Describe any substantial timing or memory changes: none + +Code reviewed by: cacraigucar, jet + +List all files eliminated: + old defaults: + atm/cam/inic/se/f.cam6_3_112.FCMTHIST_v0c.ne30.non-ogw-ubcT-effgw0.7.001.cam.i.1998-01-01-00000_c230810.nc + atm/cam/inic/se/cam7_FMT_ne30pg3_mg17_L93_c221118.nc + atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L93_01-01-31_c221214.nc + atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01-01-31_c221214.nc + +List all files added and what they do: none + Replacement Defaults: + atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc + atm/cam/inic/se/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000_c240618.nc + atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc + atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc + +List all existing files that have been modified, and describe the changes: + +bld/namelist_files/namelist_defaults_cam.xml +. Replaced problematic 93 level IC defaults with new files. + + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +derecho/intel/aux_cam: BFB except: + +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details: +SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details: +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details: +SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: FAIL) details: +- pre-existing failures + +SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +- expected change due to new IC default + +izumi/nag/aux_cam: BFB except: + +DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details: +- pre-existing failure + +izumi/gnu/aux_cam: BFB + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: This changes answers for all + configurations using cam6 physics, except for cam6 with silhs. + +=============================================================== +=============================================================== + Tag name: cam6_4_002 Originator(s): adamrher, eaton Date: Wed Jun 26, 2024 From 88ce66c5d6ef59ae6f3791f5044344b2f6e4a173 Mon Sep 17 00:00:00 2001 From: John Truesdale Date: Fri, 28 Jun 2024 11:14:55 -0600 Subject: [PATCH 7/9] update Changelog for commit --- doc/ChangeLog | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 67aa8f5f84..e347fb1d3e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,7 @@ Tag name: cam6_4_003 Originator(s): adamrher, jet -Date: Thu Jun 27, 2024 +Date: Thu Jun 28, 2024 One-line Summary: Corrected L93 default IC files Github PR URL: https://github.com/ESCOMP/CAM/pull/1040 @@ -24,14 +24,14 @@ Describe any substantial timing or memory changes: none Code reviewed by: cacraigucar, jet List all files eliminated: - old defaults: + Boundary data defaults eliminated from namelist_defaults_cam.xml (files still exist but will no longer be used) atm/cam/inic/se/f.cam6_3_112.FCMTHIST_v0c.ne30.non-ogw-ubcT-effgw0.7.001.cam.i.1998-01-01-00000_c230810.nc atm/cam/inic/se/cam7_FMT_ne30pg3_mg17_L93_c221118.nc atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L93_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01-01-31_c221214.nc List all files added and what they do: none - Replacement Defaults: + New files added to namelist_defaults-cam.xml: atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc atm/cam/inic/se/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000_c240618.nc atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc @@ -42,7 +42,6 @@ List all existing files that have been modified, and describe the changes: bld/namelist_files/namelist_defaults_cam.xml . Replaced problematic 93 level IC defaults with new files. - If there were any failures reported from running test_driver.sh on any test platform, and checkin with these failures has been OK'd by the gatekeeper, then copy the lines from the td.*.status files for the failed tests to the @@ -67,10 +66,11 @@ DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details: izumi/gnu/aux_cam: BFB CAM tag used for the baseline comparison tests if different than previous -tag: +tag: NA + +Summarize any changes to answers: This changes answers for + configurations using new default 93L IC files. -Summarize any changes to answers: This changes answers for all - configurations using cam6 physics, except for cam6 with silhs. =============================================================== =============================================================== From 4f503c7d0a8343d6c36e96fe8de49b59de142455 Mon Sep 17 00:00:00 2001 From: John Truesdale Date: Fri, 28 Jun 2024 11:17:49 -0600 Subject: [PATCH 8/9] another Changelog update for commit --- doc/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e347fb1d3e..644b56b4b4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -30,8 +30,8 @@ List all files eliminated: atm/cam/inic/se/cam6_QPC6_topo_ne3pg3_mg37_L93_01-01-31_c221214.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01-01-31_c221214.nc -List all files added and what they do: none - New files added to namelist_defaults-cam.xml: +List all files added and what they do: + New files added to data repo and namelist_defaults-cam.xml: atm/cam/inic/se/f.cam6_3_160.FCMT_ne30.moving_mtn.001.cam.i.1996-01-01-00000_c240618.nc atm/cam/inic/se/c153_ne30pg3_FMTHIST_x02.cam.i.1990-01-01-00000_c240618.nc atm/cam/inic/se/cam6_FMTHIST_ne3pg3_mg37_L93_79-02-01_c240517.nc From ace3d1f8ba6de576e5fb8fdad10ecf051de44566 Mon Sep 17 00:00:00 2001 From: John Truesdale Date: Fri, 28 Jun 2024 11:28:43 -0600 Subject: [PATCH 9/9] another Changelog update for commit --- doc/ChangeLog | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 644b56b4b4..14b401f304 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -8,9 +8,12 @@ Github PR URL: https://github.com/ESCOMP/CAM/pull/1040 Purpose of changes (include the issue number and title text for each relevant GitHub issue): -Resolves #1034 - Problematic hybrid coefficients in L99 + The L93 hybrid coefficients had a discontinuous kink, or offset, creating an anomalously thin layer + in the 300 hPa - 100 hPa altitude range. This region overlaps with the L58 grid, but for some reason + the L58 grid didn't get contaminated like it was in L93. We aren't sure how this happened. + More here: https://github.com/ESCOMP/CAM/issues/1034 -. The fix is to correct the hybrid coefficients and make a new run + fixes #1034 - Problematic hybrid coefficients in L99 Describe any changes made to build system: none @@ -23,7 +26,7 @@ Describe any substantial timing or memory changes: none Code reviewed by: cacraigucar, jet -List all files eliminated: +List all files eliminated: Boundary data defaults eliminated from namelist_defaults_cam.xml (files still exist but will no longer be used) atm/cam/inic/se/f.cam6_3_112.FCMTHIST_v0c.ne30.non-ogw-ubcT-effgw0.7.001.cam.i.1998-01-01-00000_c230810.nc atm/cam/inic/se/cam7_FMT_ne30pg3_mg17_L93_c221118.nc