From 94b9a459ce7d2612229e9f23e81bd3b3f823b2f3 Mon Sep 17 00:00:00 2001 From: adamrher Date: Sat, 22 Mar 2025 18:57:17 -0600 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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