Skip to content

Commit bb8418f

Browse files
cacraigucarcacraigucar
authored
Merge pull request #1407 from cacraigucar/cam-misc_tag
Misc changes to CAM
2 parents 27cea0e + 3a3e631 commit bb8418f

20 files changed

+372
-26065
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
[submodule "atmos_phys"]
3030
path = src/atmos_phys
3131
url = https://github.com/ESCOMP/atmospheric_physics
32-
fxtag = atmos_phys0_18_000
32+
fxtag = atmos_phys0_18_001
3333
fxrequired = AlwaysRequired
3434
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
3535

‎bld/build-namelist‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4444,12 +4444,14 @@ for my $i (0 .. $#interp_output) {
44444444

44454445
# Currently, interpolated output does not work with the COSP fields that use
44464446
# more than 1 mdims.
4447-
my $cosp_histfile_num = $nl->get_value('cosp_histfile_num');
4448-
if (!defined $cosp_histfile_num) {$cosp_histfile_num = 1;}
4449-
if ($interp_output[$cosp_histfile_num-1] =~ /$TRUE/io) {
4450-
die "$ProgName - ERROR: interpolate_output does not work with COSP. Use cosp_histfile_num\n" .
4451-
" to direct COSP output to a history file that is not interpolated. COSP output is\n" .
4452-
" currently on cosp_histfile_num=$cosp_histfile_num which contains interpolated output.";
4447+
if ($docosp) {
4448+
my $cosp_histfile_num = $nl->get_value('cosp_histfile_num');
4449+
if (!defined $cosp_histfile_num) {$cosp_histfile_num = 1;}
4450+
if ($interp_output[$cosp_histfile_num-1] =~ /$TRUE/io) {
4451+
die "$ProgName - ERROR: interpolate_output does not work with COSP. Use cosp_histfile_num\n" .
4452+
" to direct COSP output to a history file that is not interpolated. COSP output is\n" .
4453+
" currently on cosp_histfile_num=$cosp_histfile_num which contains interpolated output.";
4454+
}
44534455
}
44544456

44554457

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<ncdata hgrid="mpasa480" nlev="93" analytic_ic="1" >atm/cam/inic/mpas/mpasa480_L93_notopo_coords_c240814.nc</ncdata>
4848
<ncdata hgrid="mpasa120" nlev="93" analytic_ic="1" >atm/cam/inic/mpas/mpasa120_L93_notopo_coords_c240814.nc</ncdata>
4949
<ncdata hgrid="mpasa60" nlev="93" analytic_ic="1" >atm/cam/inic/mpas/mpasa60_L93_notopo_coords_c240814.nc</ncdata>
50+
<!-- Next entries are mostly used in EarthWorks -->
51+
<ncdata hgrid="mpasa30" nlev="58" analytic_ic="1" >atm/cam/inic/mpas/mpasa30_L58_notopo_coords_c240814.nc</ncdata>
52+
<ncdata hgrid="mpasa15" nlev="58" analytic_ic="1" >atm/cam/inic/mpas/mpasa15_L58_notopo_coords_c240911.nc</ncdata>
53+
<!-- END EarthWorks specific -->
5054

5155
<!-- FV Initial Conditions -->
5256
<ncdata hgrid="10x15" nlev="26" >atm/cam/inic/fv/cami_0000-01-01_10x15_L26_c030918.nc</ncdata>
@@ -233,13 +237,16 @@
233237
<ncdata hgrid="mpasa480" nlev="32" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc</ncdata>
234238
<ncdata hgrid="mpasa480" nlev="58" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L58_CFSR_c240814.nc</ncdata>
235239
<ncdata hgrid="mpasa480" nlev="58" aquaplanet="1" >atm/cam/inic/mpas/QPC7_mpasa480_L58_cami_c250527.nc</ncdata>
236-
<ncdata hgrid="mpasa480" nlev="93" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L93_CFSR_c240814.nc</ncdata>
237240

238241
<ncdata hgrid="mpasa120" nlev="32" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc</ncdata>
239242
<ncdata hgrid="mpasa120" nlev="58" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240814.nc</ncdata>
240243
<ncdata hgrid="mpasa120" nlev="58" aquaplanet="1" >atm/cam/inic/mpas/QPC7_mpasa120_L58_cami_c250527.nc</ncdata>
241244
<ncdata hgrid="mpasa120" nlev="70" waccm_phys="1">atm/waccm/ic/mpasa120_L70.waccm_topography_SC_c240904.nc</ncdata>
242-
<ncdata hgrid="mpasa120" nlev="93" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L93_CFSR_c240814.nc</ncdata>
245+
<!-- Next entries are mostly used in EarthWorks, real-data ICs -->
246+
<ncdata hgrid="mpasa60" nlev="58" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa60_L58_CFSR_c240905.nc</ncdata>
247+
<ncdata hgrid="mpasa30" nlev="58" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa30_L58_CFSR_c240905.nc</ncdata>
248+
<ncdata hgrid="mpasa15" nlev="58" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa15_L58_CFSR_c240905.nc</ncdata>
249+
<!-- END EarthWorks specific, real-data ICs -->
243250

244251
<!-- FV3 Initial Conditions -->
245252
<ncdata hgrid="C24" nlev="26" >atm/cam/inic/fv3/cami_0000-01-01_C24_L26_c200625.nc</ncdata>
@@ -293,20 +300,20 @@
293300

294301
<bnd_topo hgrid="ne5np4" >atm/cam/topo/se/ne5np4_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170515.nc</bnd_topo>
295302
<bnd_topo hgrid="ne16np4" >atm/cam/topo/se/ne16np4_nc3000_Co120_Fi001_PF_nullRR_Nsw084_20171012.nc</bnd_topo>
296-
<bnd_topo hgrid="ne30np4" >atm/cam/topo/se/ne30np4_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171020.nc</bnd_topo>
303+
<bnd_topo hgrid="ne30np4" >atm/cam/topo/se/ne30np4_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_greenlndantarcsgh30fac2.50_20250822.nc</bnd_topo>
297304
<bnd_topo hgrid="ne60np4" >atm/cam/topo/se/ne60np4_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171012.nc</bnd_topo>
298305
<bnd_topo hgrid="ne120np4" >atm/cam/topo/se/ne120np4_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171011.nc</bnd_topo>
299306
<bnd_topo hgrid="ne240np4" >atm/cam/topo/se/ne240np4_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171014.nc</bnd_topo>
300307

301308
<bnd_topo hgrid="ne5np4" npg="2">atm/cam/topo/se/ne5pg2_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw060_20170706.nc</bnd_topo>
302-
<bnd_topo hgrid="ne30np4" npg="2">atm/cam/topo/se/ne30pg2_nc3000_Co060_Fi001_PF_nullRR_Nsw042_20171014.nc</bnd_topo>
309+
<bnd_topo hgrid="ne30np4" npg="2">atm/cam/topo/se/ne30pg2_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_greenlndantarcsgh30fac2.50_20250825.nc</bnd_topo>
303310
<bnd_topo hgrid="ne60np4" npg="2">atm/cam/topo/se/ne60pg2_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171014.nc</bnd_topo>
304311
<bnd_topo hgrid="ne120np4" npg="2">atm/cam/topo/se/ne120pg2_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171012.nc</bnd_topo>
305312
<bnd_topo hgrid="ne240np4" npg="2">atm/cam/topo/se/ne240pg2_nc3000_Co008_Fi001_PF_nullRR_Nsw005_20171014.nc</bnd_topo>
306313
<bnd_topo hgrid="ne3np4" >atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc</bnd_topo>
307314
<bnd_topo hgrid="ne3np4" npg="3">atm/cam/topo/se/ne3pg3_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230209.nc</bnd_topo>
308315
<bnd_topo hgrid="ne5np4" npg="3">atm/cam/topo/se/ne5pg3_nc3000_Co360_Fi001_MulG_PF_nullRR_Nsw064_20170516.nc</bnd_topo>
309-
<bnd_topo hgrid="ne16np4" npg="3">atm/cam/topo/se/ne16pg3_gmted2010_modis_bedmachine_nc3000_Laplace0200_20230202.nc</bnd_topo>
316+
<bnd_topo hgrid="ne16np4" npg="3">atm/cam/topo/se/ne16pg3_gmted2010_modis_bedmachine_nc3000_Laplace0200_noleak_greenlndantarcsgh30fac2.50_20250825.nc</bnd_topo>
310317
<bnd_topo hgrid="ne30np4" npg="3">atm/cam/topo/se/ne30pg3_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_greenlndantarcsgh30fac2.50_20250828.nc</bnd_topo>
311318
<bnd_topo hgrid="ne60np4" npg="3">atm/cam/topo/se/ne60pg3_nc3000_Co030_Fi001_PF_nullRR_Nsw021_20171012.nc</bnd_topo>
312319
<bnd_topo hgrid="ne120np4" npg="3">atm/cam/topo/se/ne120pg3_nc3000_Co015_Fi001_PF_nullRR_Nsw010_20171014.nc</bnd_topo>
@@ -318,6 +325,11 @@
318325

319326
<bnd_topo hgrid="mpasa480" >atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc</bnd_topo>
320327
<bnd_topo hgrid="mpasa120" >atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc</bnd_topo>
328+
<!-- Next entires are mostly used in EarthWorks, for real-data cases -->
329+
<bnd_topo hgrid="mpasa60" >atm/cam/topo/mpas/mpasa60_gmted2010_modis_bedmachine_nc3000_Laplace0050_noleak_20240507.nc</bnd_topo>
330+
<bnd_topo hgrid="mpasa30" >atm/cam/topo/mpas/mpasa30_gmted2010_modis_bedmachine_nc3000_Laplace0025_noleak_20240507.nc</bnd_topo>
331+
<bnd_topo hgrid="mpasa15" >atm/cam/topo/mpas/mpasa15_gmted2010_modis_bedmachine_nc3000_Laplace0013_noleak_20240507.nc</bnd_topo>
332+
<!-- END EarthWorks specific, for real-data cases -->
321333

322334
<!-- Scale Dry Air Mass: 0=> no scaling / +nnn=>scale to nnn Pressure -->
323335
<scale_dry_air_mass > 0.0D0 </scale_dry_air_mass>
@@ -2017,8 +2029,11 @@
20172029
<drydep_srf_file hgrid="C192">atm/cam/chem/trop_mam/atmsrf_C192_c200625.nc</drydep_srf_file>
20182030
<drydep_srf_file hgrid="C384">atm/cam/chem/trop_mam/atmsrf_C384_c200625.nc</drydep_srf_file>
20192031

2020-
<drydep_srf_file hgrid="mpasa120">atm/cam/chem/trop_mam/atmsrf_mpasa120_c090720.nc</drydep_srf_file>
20212032
<drydep_srf_file hgrid="mpasa480">atm/cam/chem/trop_mam/atmsrf_mpasa480_c090720.nc</drydep_srf_file>
2033+
<drydep_srf_file hgrid="mpasa120">atm/cam/chem/trop_mam/atmsrf_mpasa120_c090720.nc</drydep_srf_file>
2034+
<drydep_srf_file hgrid="mpasa60">atm/cam/chem/trop_mam/atmsrf_mpasa60_c210511.nc</drydep_srf_file>
2035+
<drydep_srf_file hgrid="mpasa30">atm/cam/chem/trop_mam/atmsrf_mpasa30_c210601.nc</drydep_srf_file>
2036+
<drydep_srf_file hgrid="mpasa15">atm/cam/chem/trop_mam/atmsrf_mpasa15_c20210804.nc</drydep_srf_file>
20222037

20232038
<!-- depvel data -->
20242039
<depvel_lnd_file>atm/cam/chem/trop_mozart/dvel/regrid_vegetation.nc</depvel_lnd_file>
@@ -2294,6 +2309,14 @@
22942309
<clubb_mf_ent0 > 0.22 </clubb_mf_ent0>
22952310
<clubb_mf_nup > 10 </clubb_mf_nup>
22962311

2312+
<!-- Set radiation intervals based on mpas hgrids -->
2313+
<iradlw hgrid="mpasa15" > 10 </iradlw>
2314+
<iradsw hgrid="mpasa15" > 10 </iradsw>
2315+
<iradlw hgrid="mpasa7p5" > 10 </iradlw>
2316+
<iradsw hgrid="mpasa7p5" > 10 </iradsw>
2317+
<iradlw hgrid="mpas3p75" > 10 </iradlw>
2318+
<iradsw hgrid="mpas3p75" > 10 </iradsw>
2319+
22972320
<!-- Microphysics scheme -->
22982321
<micro_mg_do_hail > .false. </micro_mg_do_hail>
22992322
<micro_mg_do_graupel > .false. </micro_mg_do_graupel>
@@ -3322,6 +3345,10 @@
33223345
<mpas_dt hgrid="mpasa120" waccm_phys="1"> 600.D0 </mpas_dt>
33233346
<mpas_dt hgrid="mpasa60" > 450.0D0 </mpas_dt>
33243347
<mpas_dt hgrid="mpasa30" > 225.0D0 </mpas_dt>
3348+
<!-- With default ATM_NCPL, these next entries do 3 MPAS-A steps per CAM step instead of 2 -->
3349+
<mpas_dt hgrid="mpasa15" > 80.0D0 </mpas_dt>
3350+
<mpas_dt hgrid="mpasa7p5" > 40.0D0 </mpas_dt>
3351+
<mpas_dt hgrid="mpasa3p75" > 20.0D0 </mpas_dt>
33253352

33263353
<mpas_split_dynamics_transport>.true.</mpas_split_dynamics_transport>
33273354
<mpas_number_of_sub_steps > 2 </mpas_number_of_sub_steps>
@@ -3339,6 +3366,9 @@
33393366
<mpas_len_disp hgrid="mpasa120">120000.0D0</mpas_len_disp>
33403367
<mpas_len_disp hgrid="mpasa60"> 60000.0D0</mpas_len_disp>
33413368
<mpas_len_disp hgrid="mpasa30"> 30000.0D0</mpas_len_disp>
3369+
<mpas_len_disp hgrid="mpasa15"> 15000.0D0</mpas_len_disp>
3370+
<mpas_len_disp hgrid="mpasa7p5"> 7500.0D0</mpas_len_disp>
3371+
<mpas_len_disp hgrid="mpasa3p75"> 3750.0D0</mpas_len_disp>
33423372

33433373
<mpas_visc4_2dsmag > 0.05D0 </mpas_visc4_2dsmag>
33443374
<mpas_del4u_div_factor > 10.0D0 </mpas_del4u_div_factor>

‎cime_config/buildcpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@ def buildcpp(case):
7878

7979
if cam_dycore == 'fv3':
8080
config_opts += ["-fv3core_libdir", os.path.join(exeroot,"atm","obj","atmos_cubed_sphere")]
81-
81+
try:
82+
libs = case.get_values("CASE_SUPPORT_LIBRARIES")
83+
if libs is not None and "FMS" not in libs:
84+
libs.extend(["gptl","pio","csm_share","FMS"])
85+
case.set_value("CASE_SUPPORT_LIBRARIES", ",".join(libs))
86+
except:
87+
pass
8288
# The ocean component setting is only used by CAM to do attribute matching for
8389
# setting default tuning parameter values. In SOM mode we want to use the same
8490
# tunings as the fully coupled B compset, so set the ocean component to pop in

0 commit comments

Comments
 (0)