Skip to content

Implement POLARCAP & NATL grids + L58 inic for all other SE-VR grids + ne120pg3 #1287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adamrher wants to merge 10 commits into
base: cam_development
Choose a base branch
from
Draft

Implement POLARCAP & NATL grids + L58 inic for all other SE-VR grids + ne120pg3 #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d08e3e
Merge tag 'cam6_4_077' into cam_development
adamrher Mar 22, 2025
94b9a45
install POLARCAP in CAM, update cmeps external
adamrher Mar 23, 2025
7f6f4b0
Merge tag 'cam6_4_097' into cam-polarcap
adamrher Jun 17, 2025
a735323
removed comments
adamrher Jun 17, 2025
5e42f12
fix url in cmeps submodule
adamrher Jun 17, 2025
c773bfa
typo
adamrher Jun 18, 2025
e14b40c
add NATLx8 grid
adamrher Jun 18, 2025
6b0d19e
replace L32 inic
adamrher Jun 20, 2025
0734906
updated ccs_config, but NOT cmeps as it causes a clm compile error
adamrher Jun 21, 2025
f0881c0
updated cmeps and ctsm tags in gitmodule
adamrher Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -158,7 +159,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.47
fxtag = cmeps1.1.2
#fxtag = cmeps1.0.47
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

Expand Down Expand Up @@ -193,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

Expand Down
20 changes: 18 additions & 2 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<dtime dyn="se" hgrid="ne0np4CONUS.ne30x8">225</dtime>
<dtime dyn="se" hgrid="ne0np4.ARCTIC.ne30x4">450</dtime>
<dtime dyn="se" hgrid="ne0np4.ARCTICGRIS.ne30x8">225</dtime>
<dtime dyn="se" hgrid="ne0np4.POLARCAP.ne30x4">450</dtime>
<dtime dyn="se" hgrid="ne0np4.NATL.ne30x8">225</dtime>

<dtime dyn="mpas" >1800</dtime>

Expand Down Expand Up @@ -225,8 +227,14 @@
<ncdata hgrid="ne0np4CONUS.ne30x8" nlev="70" >atm/waccm/ic/FW2000_CONUS_30x8_L70_01-01-0001_c200602.nc</ncdata>

<ncdata hgrid="ne0np4.ARCTIC.ne30x4" nlev="32" >atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc</ncdata>

<ncdata hgrid="ne0np4.ARCTICGRIS.ne30x8" nlev="32" >atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc</ncdata>
<ncdata hgrid="ne0np4.NATL.ne30x8" nlev="32" >/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L32_c250620.nc</ncdata>

<ncdata hgrid="ne0np4CONUS.ne30x8" nlev="58" >/glade/work/aherring/grids/var-res/ne0np4.CONUS.ne30x8/inic/betacast_ERA5ml_20200101_CONUS_c250617.nc</ncdata>
<ncdata hgrid="ne0np4.ARCTIC.ne30x4" nlev="58" >/glade/work/aherring/grids/var-res/ne0np4.ARCTIC.ne30x4/inic/betacast_ERA5ml_20200101_ARCTIC_c250617.nc</ncdata>
<ncdata hgrid="ne0np4.ARCTICGRIS.ne30x8" nlev="58" >/glade/work/aherring/grids/var-res/ne0np4.ARCTICGRIS.ne30x8/inic/betacast_ERA5ml_20200101_ARCTICGRIS_c250617.nc</ncdata>
<ncdata hgrid="ne0np4.POLARCAP.ne30x4" nlev="58" >/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc</ncdata>
<ncdata hgrid="ne0np4.NATL.ne30x8" nlev="58" >/glade/work/aherring/grids/var-res/ne0np4.NATL.ne30x8/inic/betacast_ERA5ml_20200101_NATL_L58_c250618.nc</ncdata>

<!-- MPAS Initial Conditions -->
<ncdata hgrid="mpasa480" nlev="32" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc</ncdata>
Expand Down Expand Up @@ -314,6 +322,8 @@
<bnd_topo hgrid="ne0np4CONUS.ne30x8" >atm/cam/topo/se/ne30x8_CONUS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc</bnd_topo>
<bnd_topo hgrid="ne0np4.ARCTIC.ne30x4" >atm/cam/topo/se/ne30x4_ARCTIC_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc</bnd_topo>
<bnd_topo hgrid="ne0np4.ARCTICGRIS.ne30x8" >atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc</bnd_topo>
<bnd_topo hgrid="ne0np4.POLARCAP.ne30x4" >/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/topo/POLARCAP_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20250322.nc</bnd_topo>
<bnd_topo hgrid="ne0np4.NATL.ne30x8" >/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/topo/NATL_30_x8_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042.nc</bnd_topo>

<bnd_topo hgrid="mpasa480" >atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc</bnd_topo>
<bnd_topo hgrid="mpasa120" >atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc</bnd_topo>
Expand Down Expand Up @@ -343,6 +353,8 @@
<se_mesh_file hgrid="ne0np4TESTONLY.ne5x4" >atm/cam/coords/ne0np4EQFACE.ne5x4.g</se_mesh_file>
<se_mesh_file hgrid="ne0np4.ARCTIC.ne30x4" >atm/cam/coords/ne30x4_EXODUS_ARCTIC_c191009.g</se_mesh_file>
<se_mesh_file hgrid="ne0np4.ARCTICGRIS.ne30x8">atm/cam/coords/ne30x8_EXODUS_ARCTICGRIS_c191209.g</se_mesh_file>
<se_mesh_file hgrid="ne0np4.POLARCAP.ne30x4" >/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/grids/POLARRES_ne30x4_EXODUS.nc</se_mesh_file>
<se_mesh_file hgrid="ne0np4.NATL.ne30x8" >/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/grids/NATL_ne30x8_EXODUS.nc</se_mesh_file>

<!-- Analytic ICs -->
<analytic_ic_type > none </analytic_ic_type>
Expand Down Expand Up @@ -1985,6 +1997,8 @@
<drydep_srf_file hgrid="ne0np4CONUS.ne30x8" >atm/cam/chem/trop_mam/atmsrf_ne0np4conus30x8_161116.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne0np4.ARCTIC.ne30x4" >atm/cam/chem/trop_mam/atmsrf_ne30x4_ARCTIC_191011.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne0np4.ARCTICGRIS.ne30x8">atm/cam/chem/trop_mam/atmsrf_ne30x8_ARCTICGRIS_191212.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne0np4.POLARCAP.ne30x4" >/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/atmsrf/atmsrf_POLARCAP_250322.nc</drydep_srf_file>
<drydep_srf_file hgrid="ne0np4.NATL.ne30x8">/glade/work/rwills/grids/var-res/ne0np4.NATL.ne30x8/atmsrf/atmsrf_ne0np4.NATL.ne30x8_201109.nc</drydep_srf_file>

<drydep_srf_file hgrid="C24">atm/cam/chem/trop_mam/atmsrf_C24_c200625.nc</drydep_srf_file>
<drydep_srf_file hgrid="C48">atm/cam/chem/trop_mam/atmsrf_C48_c200625.nc</drydep_srf_file>
Expand Down Expand Up @@ -2375,7 +2389,7 @@
<cld_macmic_num_steps microphys="mg2" clubb_sgs="1" dtime="600" > 1 </cld_macmic_num_steps>
<cld_macmic_num_steps microphys="mg2" clubb_sgs="1" dtime="300" > 1 </cld_macmic_num_steps>
<cld_macmic_num_steps microphys="mg3" clubb_sgs="1"> 3 </cld_macmic_num_steps>
<!-- hi-res and var-res support for ne120, ARCTIC, ARCTCIGRIS, CONUS -->
<!-- hi-res and var-res support for ne120, ARCTIC, ARCTICGRIS, POLARCAP, CONUS, NATL -->
<cld_macmic_num_steps microphys="mg2" clubb_sgs="1" dtime="450" > 2 </cld_macmic_num_steps>
<cld_macmic_num_steps microphys="mg2" clubb_sgs="1" dtime="225" > 1 </cld_macmic_num_steps>
<cld_macmic_num_steps microphys="mg3" clubb_sgs="1" dtime="450" > 2 </cld_macmic_num_steps>
Expand Down Expand Up @@ -3243,6 +3257,8 @@
<se_refined_mesh hgrid="ne0np4TESTONLY.ne5x4" > .true. </se_refined_mesh>
<se_refined_mesh hgrid="ne0np4.ARCTIC.ne30x4" > .true. </se_refined_mesh>
<se_refined_mesh hgrid="ne0np4.ARCTICGRIS.ne30x8" > .true. </se_refined_mesh>
<se_refined_mesh hgrid="ne0np4.POLARCAP.ne30x4" > .true. </se_refined_mesh>
<se_refined_mesh hgrid="ne0np4.NATL.ne30x8" > .true. </se_refined_mesh>

<se_nsplit> 2 </se_nsplit>
<se_nsplit hgrid="ne16np4" > 1 </se_nsplit>
Expand Down
2 changes: 1 addition & 1 deletion ccs_config
Open in desktop
Submodule ccs_config updated 11 files
+68 −0 component_grids_nuopc.xml
+9 −0 machines/Depends.gnu
+6 −0 machines/Depends.nvhpc
+0 −1 machines/cmake_macros/CMakeLists.txt
+3 −3 machines/cmake_macros/CNL.cmake
+1 −0 machines/cmake_macros/Macros.cmake
+1 −1 machines/cmake_macros/nvhpc.cmake
+40 −13 machines/derecho/config_machines.xml
+8 −0 machines/derecho/derecho.cmake
+28 −0 maps_nuopc.xml
+207 −0 modelgrid_aliases_nuopc.xml
2 changes: 1 addition & 1 deletion components/clm
Open in desktop
Submodule clm updated 323 files
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated 6 files
+1 −1 .github/workflows/bumpversion.yml
+6 −6 cesm/nuopc_cap_share/shr_megan_mod.F90
+1 −1 cime_config/config_archive.xml
+23 −3 cime_config/config_component.xml
+2 −1 cime_config/config_component_cesm.xml
+2 −0 mediator/med_map_mod.F90