Skip to content

Implement POLARCAP & NATL grids + L58 inic for all other SE-VR grids #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

Open
wants to merge 9 commits into
base: cam_development
Choose a base branch
from
+22 −4
Open

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 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
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
11 changes: 8 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion 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,7 @@
<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="mpas" >1800</dtime>

Expand Down Expand Up @@ -254,6 +255,7 @@
<ncdata dyn="se" hgrid="ne0np4CONUS.ne30x8" nlev="32" ic_ymd="101">atm/cam/inic/se/F2000climo_CONUS_30x8_mt12_mg3_01-01-00000_c200421.nc</ncdata>
<ncdata dyn="se" hgrid="ne0np4.ARCTIC.ne30x4" nlev="32" ic_ymd="101">atm/cam/inic/se/FHIST_ARCTIC_ne30x4_mt12_1979bc-mg3_01-01-00000_c200424.nc</ncdata>
<ncdata dyn="se" hgrid="ne0np4.ARCTICGRIS.ne30x8" nlev="32" ic_ymd="101">atm/cam/inic/se/FHIST_ARCTICGRIS_ne30x8_mt12_1979bc-mg3_01-01-00000_c200428.nc</ncdata>
<ncdata dyn="se" hgrid="ne0np4.POLARCAP.ne30x4" nlev="58" ic_ymd="101">/glade/work/aherring/grids/var-res/ne0np4.POLARRES.ne30x4/inic/betacast_ERA5ml_20200101_POLARCAP_c250322.nc</ncdata>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These files need to be moved into the /glade/p/cesmdata/inputdata section of derecho and make sure they have the "mandatory metadata" https://www2.cesm.ucar.edu/working_groups/Atmosphere/amwg_datasets.html


<ncdata dyn="se" hgrid="ne5np4" nlev="66" ic_ymd="101">atm/waccm/ic/wa3_ne5np4_1950_spinup.cam2.i.1960-01-01-00000_c150810.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="70" ic_ymd="101">atm/waccm/ic/FW2000_ne30_L70_01-01-0001_c200602.nc</ncdata>
Expand Down Expand Up @@ -314,6 +316,7 @@
<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="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 +346,7 @@
<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>

<!-- Analytic ICs -->
<analytic_ic_type > none </analytic_ic_type>
Expand Down Expand Up @@ -1985,6 +1989,7 @@
<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="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 +2380,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, ARCTCIGRIS, POLARCAP, CONUS -->
<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 @@ -3241,6 +3246,7 @@
<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_nsplit> 2 </se_nsplit>
<se_nsplit hgrid="ne16np4" > 1 </se_nsplit>
Expand Down
2 changes: 1 addition & 1 deletion cime
Open in desktop
Submodule cime updated 31 files
+1 −0 .git-blame-ignore-revs
+5 −5 .github/workflows/docs.yml
+1 −1 .github/workflows/testing.yml
+2 −2 CIME/SystemTests/eri.py
+4 −1 CIME/SystemTests/ers.py
+1 −1 CIME/SystemTests/restart_tests.py
+6 −0 CIME/SystemTests/system_tests_common.py
+2 −2 CIME/SystemTests/test_mods.py
+7 −0 CIME/Tools/bless_test_results
+23 −4 CIME/Tools/case.setup
+17 −3 CIME/XML/env_batch.py
+5 −1 CIME/XML/env_mach_specific.py
+22 −0 CIME/XML/env_postprocessing.py
+40 −0 CIME/XML/postprocessing.py
+16 −0 CIME/bless_test_results.py
+27 −0 CIME/case/case.py
+3 −3 CIME/case/case_clone.py
+5 −2 CIME/case/case_setup.py
+9 −0 CIME/data/config/cesm/config_files.xml
+7 −0 CIME/data/config/config_headers.xml
+11 −5 CIME/hist_utils.py
+5 −4 CIME/jenkins_generic_job.py
+1 −1 CIME/non_py/cprnc
+26 −3 CIME/scripts/create_test.py
+16 −2 CIME/test_scheduler.py
+8 −1 CIME/tests/base.py
+25 −2 CIME/tests/test_sys_cime_case.py
+1 −0 CIME/tests/test_unit_system_tests.py
+68 −0 CIME/tests/test_unit_xml_env_batch.py
+1 −0 CIME/utils.py
+1 −0 CIME/wait_for_tests.py
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated 8 files
+2 −2 .github/workflows/extbuild.yml
+1 −0 cime_config/config_component_cesm.xml
+2 −2 cime_config/namelist_definition_drv.xml
+32 −0 mediator/esmFldsExchange_ufs_mod.F90
+2 −2 mediator/med.F90
+19 −0 mediator/med_phases_restart_mod.F90
+8 −0 ufs/ccpp/data/MED_typedefs.F90
+20 −0 ufs/ccpp/data/MED_typedefs.meta