From 94b9a459ce7d2612229e9f23e81bd3b3f823b2f3 Mon Sep 17 00:00:00 2001 From: adamrher Date: Sat, 22 Mar 2025 18:57:17 -0600 Subject: [PATCH 01/20] install POLARCAP in CAM, update cmeps external --- .gitmodules | 11 ++++++++--- bld/namelist_files/namelist_defaults_cam.xml | 8 +++++++- cime | 2 +- components/cmeps | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a77b99743f..593e2eabdd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -157,10 +157,15 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps -url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.39 +url = https://github.com/adamrher/CMEPS.git +fxtag = a283c1fdb4fcb98d80765e29cdfcfeaf297900e5 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git +fxDONOTUSEurl = https://github.com/adamrher/CMEPS.git + +#url = https://github.com/ESCOMP/CMEPS.git +#fxtag = cmeps1.0.39 +#fxrequired = ToplevelRequired +#fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index e6ce1fc9fd..7b9e206d1a 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -25,6 +25,7 @@ 225 450 225 +450 1800 @@ -254,6 +255,7 @@ atm/cam/inic/se/F2000climo_CONUS_30x8_mt12_mg3_01-01-00000_c200421.nc atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc atm/waccm/ic/wa3_ne5np4_1950_spinup.cam2.i.1960-01-01-00000_c150810.nc atm/waccm/ic/FW2000_ne30_L70_01-01-0001_c200602.nc @@ -314,6 +316,7 @@ atm/cam/topo/se/ne30x8_CONUS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/topo/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc @@ -343,6 +346,7 @@ atm/cam/coords/ne0np4EQFACE.ne5x4.g atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARRES_ne30x4_EXODUS.nc none @@ -1985,6 +1989,7 @@ atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc @@ -2375,7 +2380,7 @@ 1 1 3 - + 2 1 2 @@ -3241,6 +3246,7 @@ .true. .true. .true. + .true. 2 1 diff --git a/cime b/cime index cdf76d6919..71d2b71216 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit cdf76d691961d697feafc14907f81b9c195dfe99 +Subproject commit 71d2b71216cc39abfb8224cc55861bd6424c95f9 diff --git a/components/cmeps b/components/cmeps index 189b02e2b3..a283c1fdb4 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 189b02e2b36b9a5a064150179721de45af3bbacf +Subproject commit a283c1fdb4fcb98d80765e29cdfcfeaf297900e5 From a735323de5cef2181fcae2d81d658d82c64ed11d Mon Sep 17 00:00:00 2001 From: adamrher Date: Tue, 17 Jun 2025 16:13:56 -0600 Subject: [PATCH 02/20] removed comments --- .gitmodules | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1cbd6117f0..2e815d5dd8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -162,11 +162,6 @@ fxtag = cmeps1.0.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/adamrher/CMEPS.git -#url = https://github.com/ESCOMP/CMEPS.git -#fxtag = cmeps1.0.39 -#fxrequired = ToplevelRequired -#fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git - [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git From 5e42f12eb45792b0a949815bfc5623d32b5df100 Mon Sep 17 00:00:00 2001 From: adamrher Date: Tue, 17 Jun 2025 17:46:41 -0600 Subject: [PATCH 03/20] fix url in cmeps submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2e815d5dd8..169d3259e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -160,7 +160,7 @@ path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git fxtag = cmeps1.0.47 fxrequired = ToplevelRequired -fxDONOTUSEurl = https://github.com/adamrher/CMEPS.git +fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps From c773bfa31d345ef9bacc6e3d20c3885d22fa0ae9 Mon Sep 17 00:00:00 2001 From: adamrher Date: Tue, 17 Jun 2025 19:23:59 -0600 Subject: [PATCH 04/20] typo --- 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 7ac2b467d1..379584e0a7 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2383,7 +2383,7 @@ 1 1 3 - + 2 1 2 From e14b40cf6fc24b50c80c9caae8ae3abc149c0da4 Mon Sep 17 00:00:00 2001 From: adamrher Date: Wed, 18 Jun 2025 14:36:53 -0600 Subject: [PATCH 05/20] add NATLx8 grid --- bld/namelist_files/namelist_defaults_cam.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 379584e0a7..da78868887 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -26,6 +26,7 @@ 450 225 450 +225 1800 @@ -227,11 +228,13 @@ atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/inic/cami-mam4_0000-01-01_ne0np4.NATL.ne30x8_L32_c201109.nc /glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_c250618.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc @@ -320,6 +323,7 @@ atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/topo/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/topo/NATL_30_x8_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc @@ -350,6 +354,7 @@ atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARRES_ne30x4_EXODUS.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc none @@ -1993,6 +1998,7 @@ atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc +/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc @@ -2383,7 +2389,7 @@ 1 1 3 - + 2 1 2 @@ -3252,6 +3258,7 @@ .true. .true. .true. + .true. 2 1 From 6b0d19ed0c7ebe9b542da4f26376633db03e4604 Mon Sep 17 00:00:00 2001 From: adamrher Date: Fri, 20 Jun 2025 15:11:58 -0600 Subject: [PATCH 06/20] replace L32 inic --- bld/namelist_files/namelist_defaults_cam.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index da78868887..f0ced80113 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -228,13 +228,13 @@ atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc -/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/inic/cami-mam4_0000-01-01_ne0np4.NATL.ne30x8_L32_c201109.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L32_c250620.nc /glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_c250618.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L58_c250618.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc From 0734906f8fb1a43b0087e4da67b185077f9a637c Mon Sep 17 00:00:00 2001 From: adamrher Date: Fri, 20 Jun 2025 18:59:40 -0600 Subject: [PATCH 07/20] updated ccs_config, but NOT cmeps as it causes a clm compile error --- .gitmodules | 4 +++- ccs_config | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 169d3259e4..2022373360 100644 --- a/.gitmodules +++ b/.gitmodules @@ -144,7 +144,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.40_izumi_update0.1 +fxtag = ccs_config_cesm1.0.48 +#fxtag = ccs_config_cesm1.0.40_izumi_update0.1 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -158,6 +159,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git +#fxtag = cmeps1.1.2 fxtag = cmeps1.0.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git diff --git a/ccs_config b/ccs_config index 4051731712..4b5e4eb54d 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 40517317127076c5e772f5eba2599899df6fb527 +Subproject commit 4b5e4eb54d6a0ec7de59065b897d2de2524e0ecf From f0881c07d23fb9d1dd07cac2483ad7b046a5e4e2 Mon Sep 17 00:00:00 2001 From: adamrher Date: Tue, 24 Jun 2025 16:37:35 -0600 Subject: [PATCH 08/20] updated cmeps and ctsm tags in gitmodule --- .gitmodules | 7 ++++--- components/clm | 2 +- components/cmeps | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2022373360..13ca149f91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -159,8 +159,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -#fxtag = cmeps1.1.2 -fxtag = cmeps1.0.47 +fxtag = cmeps1.1.2 +#fxtag = cmeps1.0.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git @@ -195,7 +195,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE [submodule "clm"] path = components/clm url = https://github.com/ESCOMP/CTSM -fxtag = ctsm5.3.029 +#fxtag = ctsm5.3.029 +fxtag = ctsm5.3.052 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CTSM diff --git a/components/clm b/components/clm index be65fad30a..57d3f31bf2 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit be65fad30a741fc594bca9e1221ffe987e7bf271 +Subproject commit 57d3f31bf223d2838f00c7f612c3efc9fe94be6b diff --git a/components/cmeps b/components/cmeps index dfe357ec28..bd3ff83126 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit dfe357ec28da465b1d0e435594c6bd6700ce62f3 +Subproject commit bd3ff83126516a16263fc7c4c16bbdeb4bd753b3 From ca67baebc12f5ee8f140dc4712823727ba5abbf3 Mon Sep 17 00:00:00 2001 From: adamrher Date: Thu, 26 Feb 2026 15:31:46 -0700 Subject: [PATCH 09/20] add L93 support for VR-SE grids, ne120pg3 --- bld/namelist_files/namelist_defaults_cam.xml | 99 ++++++++++++-------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 00085d9645..1e65e9ea36 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -222,6 +222,8 @@ atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc atm/cam/inic/se/F2000climo_ne120pg3_mt13_01-01-00000_c200420.nc atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc +/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L58_c260225.nc +/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L93_c260225.nc atm/waccm/ic/fx2000_ne120pg3L273.001.cam.i.0002-01-01-00000.noBRCL_c250522.nc atm/cam/inic/homme/cami_1850-01-01_ne240np4_L26_c110314.nc @@ -238,12 +240,16 @@ atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc /glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L32_c250620.nc - /glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc /glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L58_c250618.nc +/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20100101_CONUS_ne30x8_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20100101_ARCTIC_ne30x4_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20100101_ARCTICGRIS_ne30x8_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20100101_POLARCAP_ne30x4_L93_c260225.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20100101_NATL_ne30x8_L93_c260225.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc @@ -3238,21 +3244,29 @@ 18 18 30 + 2 + + 1 + 3 + 3 + 2 + 4 + 20 + 60 + 4 + 2 + 4 + 2 + 4 + 40 + 180 + 10 + 3 + 3 + 6 + 6 + 6 - 1 - 3 - 3 - 2 - 4 - 20 - 60 - 4 - 2 - 4 - 2 - 4 - 40 - 180 1 2 @@ -3313,29 +3327,40 @@ 2 1 - 3 - 3 - 2 - 3 - 3 + 3 + 3 + 2 + 3 + 3 4 - 2 - 4 - 4 - 5 - 10 - - 7 - 10 - - 3 - 3 - 2 - 2 - 4 - 2 - 3 - 5 + 2 + 4 + 4 + 5 + 10 + 7 + 10 + 8 + 3 + 3 + 4 + 4 + 4 + + 3 + 3 + 2 + 2 + 4 + 2 + 3 + 5 + 3 + 6 + 6 + 5 + 5 + 5 -1 -1 From a5355fc9f0a67d4ab920f0933ae5999e14c34b78 Mon Sep 17 00:00:00 2001 From: adamrher Date: Mon, 30 Mar 2026 18:09:50 -0600 Subject: [PATCH 10/20] add tests for two new VR-SE grids --- cime_config/testdefs/testlist_cam.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index a0620c5f70..cc814b95bf 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1545,6 +1545,24 @@ + + + + + + + + + + + + + + + + + + From 3585925ce7f1bf45a7dffbe916d436aab22701f4 Mon Sep 17 00:00:00 2001 From: adamrher Date: Mon, 30 Mar 2026 19:11:24 -0600 Subject: [PATCH 11/20] add default time-stepping for non mt VR-SE grids --- bld/namelist_files/namelist_defaults_cam.xml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 8165c8f732..f363736c1c 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -3242,7 +3242,11 @@ 5 2 3 - 3 + 1 + 1 + 1 + 1 + 1 1 18 18 @@ -3259,7 +3263,9 @@ 20 60 4 - 2 + 5 + 5 + 5 4 2 4 @@ -3342,12 +3348,15 @@ 4 4 5 + 3 + 3 + 3 + 3 + 3 10 7 10 8 - 3 - 3 4 4 4 From ef3059ebb57da8592b71ee16ced4081a98903a80 Mon Sep 17 00:00:00 2001 From: adamrher Date: Mon, 13 Apr 2026 12:08:57 -0600 Subject: [PATCH 12/20] update local paths to input datasets --- bld/namelist_files/namelist_defaults_cam.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index f363736c1c..440783e39e 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -377,8 +377,8 @@ atm/cam/coords/ne0np4EQFACE.ne5x4.g atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARRES_ne30x4_EXODUS.nc -/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc +/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARCAP_ne30x4_EXODUS.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc none @@ -2063,7 +2063,7 @@ atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc /glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc -/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc +/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc From 250ec8de7a8567e095c27aa2f42d3f758f7fb9c0 Mon Sep 17 00:00:00 2001 From: adamrher Date: Mon, 13 Apr 2026 18:35:51 -0600 Subject: [PATCH 13/20] update paths to point to inputdata files --- bld/namelist_files/namelist_defaults_cam.xml | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 440783e39e..ae6c26273b 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -222,8 +222,8 @@ atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc atm/cam/inic/se/F2000climo_ne120pg3_mt13_01-01-00000_c200420.nc atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc -/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L58_c260225.nc -/glade/work/aherring/grids/uniform-res/ne120np4.pg3/inic/betacast_ERA5ml_20100101_ne120np4_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_ne120np4_L58_c260225.nc +atm/cam/inic/se/inic/betacast_ERA5ml_20100101_ne120np4_L93_c260225.nc atm/waccm/ic/fx2000_ne120pg3L273.001.cam.i.0002-01-01-00000.noBRCL_c250522.nc atm/cam/inic/homme/cami_1850-01-01_ne240np4_L26_c110314.nc @@ -239,17 +239,17 @@ atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L32_c250620.nc -/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc -/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc -/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L58_c250618.nc -/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20100101_CONUS_ne30x8_L93_c260225.nc -/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20100101_ARCTIC_ne30x4_L93_c260225.nc -/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20100101_ARCTICGRIS_ne30x8_L93_c260225.nc -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20100101_POLARCAP_ne30x4_L93_c260225.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20100101_NATL_ne30x8_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_NATL_L32_c250620.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_CONUS_c250617.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_ARCTIC_c250617.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_POLARCAP_c250322.nc +atm/cam/inic/se/betacast_ERA5ml_20200101_NATL_L58_c250618.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_CONUS_ne30x8_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_ARCTIC_ne30x4_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_ARCTICGRIS_ne30x8_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_POLARCAP_ne30x4_L93_c260225.nc +atm/cam/inic/se/betacast_ERA5ml_20100101_NATL_ne30x8_L93_c260225.nc atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc @@ -341,8 +341,8 @@ atm/cam/topo/se/ne30x8_CONUS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/topo/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/topo/NATL.ne30x8_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20260225.nc +atm/cam/topo/se/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_c20250322.nc +atm/cam/topo/se/NATL.ne30x8_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_c20260225.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc @@ -377,8 +377,8 @@ atm/cam/coords/ne0np4EQFACE.ne5x4.g atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARCAP_ne30x4_EXODUS.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc +atm/cam/coords/POLARCAP_ne30x4_EXODUS_c220531.nc +atm/cam/coords/NATL_ne30x8_EXODUS_c201016.nc none @@ -2062,8 +2062,8 @@ atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc -/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc -/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc +atm/cam/chem/trop_mam//atmsrf_POLARCAP_c250322.nc +atm/cam/chem/trop_mam/atmsrf_ne0np4.NATL.ne30x8_c201109.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc From 69133df9a39d7605ac52298856db41cae9e711ef Mon Sep 17 00:00:00 2001 From: adamrher Date: Mon, 13 Apr 2026 19:01:04 -0600 Subject: [PATCH 14/20] fix 4 newly committed paths --- 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 ae6c26273b..5492e5c20f 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -341,8 +341,8 @@ atm/cam/topo/se/ne30x8_CONUS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc -atm/cam/topo/se/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_c20250322.nc -atm/cam/topo/se/NATL.ne30x8_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_c20260225.nc +atm/cam/topo/se/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc +atm/cam/topo/se/NATL.ne30x8_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20260225.nc atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc @@ -2062,8 +2062,8 @@ atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc -atm/cam/chem/trop_mam//atmsrf_POLARCAP_c250322.nc -atm/cam/chem/trop_mam/atmsrf_ne0np4.NATL.ne30x8_c201109.nc +atm/cam/chem/trop_mam/atmsrf_POLARCAP_250322.nc +atm/cam/chem/trop_mam/atmsrf_ne0np4.NATL.ne30x8_201109.nc atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc From 457f87cc5fdae5f9c71ac02e0342090a4598cb0c Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 16 Apr 2026 10:59:06 -0600 Subject: [PATCH 15/20] Add additional test to cam_refined test suite --- cime_config/testdefs/testlist_cam.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index dff3e6c1ba..939f0d31f6 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1512,6 +1512,7 @@ + From 4005a28d049c2d20c11d293a741810543d77a129 Mon Sep 17 00:00:00 2001 From: adamrher Date: Thu, 16 Apr 2026 11:03:19 -0600 Subject: [PATCH 16/20] fix time-stepping for ARCTIC and POLARCAR --- bld/namelist_files/namelist_defaults_cam.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 5492e5c20f..bc57a5e033 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -3242,8 +3242,8 @@ 5 2 3 - 1 - 1 + 2 + 2 1 1 1 @@ -3263,6 +3263,8 @@ 20 60 4 + 2 + 2 5 5 5 From 9a4988eea4753ef34b82f0550a7306c7bd0d9937 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 16 Apr 2026 13:29:22 -0600 Subject: [PATCH 17/20] Preliminary ChangeLog --- doc/ChangeLog | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9b39012a4e..ef235ee823 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,53 @@ =============================================================== +Tag name: cam6_4_165 +Originator(s): adamrher, cacraigucar +Date: April 16, 2026 +One-line Summary: Implement POLARCAP and NATL grids +L58 inic for all other SE-VR grids +Github PR URL: htpps://github.com/ESCOMP/CAM/pull/1287 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Install SE dual-polar VR grid: https://github.com/ESCOMP/CAM/issues/979 + - Add NATLx8 grid: https://github.com/ESCOMP/CAM/issues/1330 + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: + +List any changes to the defaults for the boundary datasets: + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: cacraigucar, PeterHjortLauritzen + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M bld/namelist_files/namelist_defaults_cam.xml + - + +M cime_config/testdefs/testlist_cam.xml + - Add prebeta and cam_refined tests for new grids + +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: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: all BFB + +=============================================================== +=============================================================== + Tag name: cam6_4_164 Originator(s): cacraigucar, billsacks, sjsprecious, nusbaume, jimmielin Date: April 15, 2026 From 15e07bf69a863f4dba58c08bedb315e9930639a6 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 16 Apr 2026 13:34:22 -0600 Subject: [PATCH 18/20] Preliminary ChangeLog --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ef235ee823..d0483b204a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -43,7 +43,7 @@ derecho/nvhpc/aux_cam: izumi/nag/aux_cam: -izumi/gnu/aux_cam: all BFB +izumi/gnu/aux_cam: =============================================================== =============================================================== From e5064457d3d747c8be22ab724778c77dce3c6768 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 17 Apr 2026 10:47:30 -0600 Subject: [PATCH 19/20] Preliminary ChangeLog for cam6_4_165 --- doc/ChangeLog | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index d0483b204a..ea1203f1d8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -38,12 +38,24 @@ 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: + SMS_D_Ln9.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + - Answers expected to change for refined grids -derecho/nvhpc/aux_cam: + SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + - intermittent failure in CTSM code (lnd_set_decomp_and_domain.F90) + +derecho/nvhpc/aux_cam: all BFB izumi/nag/aux_cam: + ERC_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_nag.cam-outfrq3s_subcol (Overall: FAIL) details: + FAIL ERC_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_nag.cam-outfrq3s_subcol COMPARE_base_rest + - pre-existing failure -- see https://github.com/ESCOMP/CAM/issues/1514 -izumi/gnu/aux_cam: +izumi/gnu/aux_cam: all BFB + +Ran cam_refined tests as well. All ran to completion except: +SMS_D_Ln9_P1280x1.ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12.FHISTC_LTso.derecho_intel.cam-outfrq9s + - Same failure as the above CONUS test =============================================================== =============================================================== From 3b6446d12938bcd217e2d1df4d3492ed248b97f9 Mon Sep 17 00:00:00 2001 From: adamrher Date: Fri, 17 Apr 2026 11:34:53 -0600 Subject: [PATCH 20/20] update ChangeLog --- doc/ChangeLog | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ea1203f1d8..4f942aa1ad 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,19 +4,20 @@ Tag name: cam6_4_165 Originator(s): adamrher, cacraigucar Date: April 16, 2026 -One-line Summary: Implement POLARCAP and NATL grids +L58 inic for all other SE-VR grids +One-line Summary: Implement POLARCAP and NATL grids +L58/L93 inic for all SE-VR grids Github PR URL: htpps://github.com/ESCOMP/CAM/pull/1287 Purpose of changes (include the issue number and title text for each relevant GitHub issue): - Install SE dual-polar VR grid: https://github.com/ESCOMP/CAM/issues/979 - Add NATLx8 grid: https://github.com/ESCOMP/CAM/issues/1330 + - Add L58/L93 support for all VR-SE grids + ne120pg3 Describe any changes made to build system: N/A Describe any changes made to the namelist: - + - added SE-VR defaults for new inputdata files and dycore time-stepping List any changes to the defaults for the boundary datasets: - + - added ncdata, bnd_topo, drydep_srf_file, se_mesh_file for new and existing grids Describe any substantial timing or memory changes: N/A Code reviewed by: cacraigucar, PeterHjortLauritzen @@ -27,7 +28,9 @@ List all files added and what they do: N/A List all existing files that have been modified, and describe the changes: M bld/namelist_files/namelist_defaults_cam.xml - - + - added SE-VR entries for dycore time-stepping + - added L58 & L93 ncdata entries for all SE-VR grids + ne120pg3 + - added bnd_topo, drydep_srf_file, se_mesh_file for POLARCAP & NATL grids M cime_config/testdefs/testlist_cam.xml - Add prebeta and cam_refined tests for new grids