Skip to content

Commit

Permalink
Merge pull request #981 from cacraigucar/update_namelist
Browse files Browse the repository at this point in the history 
cam6_3_153: Update namelist settings
  • Loading branch information
@cacraigucar
cacraigucar authored Mar 26, 2024
2 parents 39b31b4 + d2fe0de commit 61b739e
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 56 deletions.
49 changes: 0 additions & 49 deletions README_EXTERNALS
View file

This file was deleted.

2 changes: 1 addition & 1 deletion bld/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ elsif ($fc =~ /nvfor/) { $fc_type = 'nvhpc'; }

# User override for Fortran compiler type
if (defined $opts{'fc_type'}) { $fc_type = $opts{'fc_type'}; }
if ($fc_type eq "oneapi") {$fc_type = 'intel'; }
if ($fc_type =~ /intel/) {$fc_type = 'intel'; }
if ($fc_type) {
$cfg_ref->set('fc_type', $fc_type);
if ($print>=2) { print "Fortran compiler type: $fc_type$eol"; }
Expand Down
9 changes: 4 additions & 5 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2133,6 +2133,7 @@
<clubb_C7 phys="cam_dev" > 0.1 </clubb_C7>
<clubb_C7b > 0.5 </clubb_C7b>
<clubb_C8 > 4.2 </clubb_C8>
<clubb_C8 phys="cam_dev" > 4.25 </clubb_C8>
<clubb_C8b > 0.0 </clubb_C8b>
<clubb_C_invrs_tau_bkgnd > 1.0 </clubb_C_invrs_tau_bkgnd>
<clubb_C_invrs_tau_sfc > 0.1 </clubb_C_invrs_tau_sfc>
Expand Down Expand Up @@ -2172,6 +2173,7 @@
<clubb_l_damp_wp2_using_em > .false. </clubb_l_damp_wp2_using_em>
<clubb_l_damp_wp3_Skw_squared > .false. </clubb_l_damp_wp3_Skw_squared>
<clubb_l_do_expldiff_rtm_thlm > .false. </clubb_l_do_expldiff_rtm_thlm>
<clubb_l_do_expldiff_rtm_thlm phys="cam_dev" > .true. </clubb_l_do_expldiff_rtm_thlm>
<clubb_l_e3sm_config > .false. </clubb_l_e3sm_config>
<clubb_l_enable_relaxed_clipping > .false. </clubb_l_enable_relaxed_clipping>
<clubb_l_godunov_upwind_wpxp_ta > .false. </clubb_l_godunov_upwind_wpxp_ta>
Expand Down Expand Up @@ -2323,7 +2325,6 @@
<microp_aero_npccn_scale microphys="mg2" > 1.D0 </microp_aero_npccn_scale>

<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
<microp_aero_wsub_scale phys="cam_dev" > 0.375D0 </microp_aero_wsub_scale>

<microp_aero_wsubi_scale > 1.D0 </microp_aero_wsubi_scale>

Expand Down Expand Up @@ -2463,7 +2464,7 @@
<dust_emis_fact hgrid="0.47x0.63" phys="spcam_m2005" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.23x0.31" phys="cam5" >0.45D0</dust_emis_fact>
<dust_emis_fact phys="cam6" >0.35D0</dust_emis_fact>
<dust_emis_fact phys="cam_dev" >0.35D0</dust_emis_fact>
<dust_emis_fact phys="cam_dev" >1.30D0</dust_emis_fact>
<dust_emis_fact phys="cam6" silhs="1" >0.30D0</dust_emis_fact>
<dust_emis_fact phys="cam_dev" silhs="1" >0.30D0</dust_emis_fact>
<dust_emis_fact hgrid="0.47x0.63" phys="cam6" >0.45D0</dust_emis_fact>
Expand All @@ -2475,7 +2476,7 @@
<dust_emis_fact dyn="se" phys="cam5" >0.55D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="cam5" clubb_sgs="1" >0.22D0</dust_emis_fact>
<dust_emis_fact dyn="se" phys="cam6" >0.70D0</dust_emis_fact>
<dust_emis_fact dyn="se" phys="cam_dev" >0.80D0</dust_emis_fact>
<dust_emis_fact dyn="se" phys="cam_dev" >1.30D0</dust_emis_fact>
<dust_emis_fact dyn="se" hgrid="ne30np4" phys="cam6" chem="trop_strat_mam4_vbs">0.8D0</dust_emis_fact>
<dust_emis_fact dyn="se" hgrid="ne30np4" phys="cam_dev" chem="trop_strat_mam4_vbs">0.8D0</dust_emis_fact>
<dust_emis_fact dyn="se" hgrid="ne0np4CONUS.ne30x8" phys="cam6" chem="trop_strat_mam4_vbs">0.8D0</dust_emis_fact>
Expand Down Expand Up @@ -2747,7 +2748,6 @@
<cldfrc2m_rhmaxis spcam_clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxis>

<cldfrc2m_qist_min >1.e-7 </cldfrc2m_qist_min>
<cldfrc2m_qist_min phys="cam_dev">5.e-6 </cldfrc2m_qist_min>
<cldfrc2m_qist_max >5.e-3 </cldfrc2m_qist_max>

<micro_mg_adjust_cpt>.false.</micro_mg_adjust_cpt>
Expand All @@ -2757,7 +2757,6 @@
<cldfrc2m_do_subgrid_growth phys="cam_dev">.true.</cldfrc2m_do_subgrid_growth>

<cldfrc2m_do_avg_aist_algs >.false.</cldfrc2m_do_avg_aist_algs>
<cldfrc2m_do_avg_aist_algs phys="cam_dev" >.true.</cldfrc2m_do_avg_aist_algs>

<!-- Cldwat -->
<rk_strat_icritc > 5.0e-6 </rk_strat_icritc>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/buildnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def buildnml(case, caseroot, compname):
# -----------------------------------------------------

if os.path.isdir(rundir) \
and os.path.exists(os.path.join(caseroot, "species_database.yaml"))\
and os.path.exists(os.path.join(caseroot, "species_database.yml"))\
and '-chem geoschem' in CAM_CONFIG_OPTS:
for fname in ['species_database.yml', 'geoschem_config.yml',
'HISTORY.rc', 'HEMCO_Config.rc', 'HEMCO_Diagn.rc']:
Expand Down
80 changes: 80 additions & 0 deletions doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,83 @@

===============================================================

Tag name: cam6_3_153
Originator(s): cacraig, hannay, jedwards, lizziel
Date: March 26, 2023
One-line Summary: Update namelist settings
Github PR URL: https://github.com/ESCOMP/CAM/pull/981

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Bring in namelist settings which Cecile is using for current testing: https://github.com/ESCOMP/CAM/issues/976
- Remove README_EXTERNALS: https://github.com/ESCOMP/CAM/issues/954
- fix so that all three flavors of intel compiler are recognized: https://github.com/ESCOMP/CAM/pull/990
- CAM no longer builds with intel-oneapi compilers: https://github.com/ESCOMP/CAM/issues/988
- GEOS-Chem compsets will fail due to bugs in CAM and CIME: https://github.com/ESCOMP/CAM/issues/1004
- This fixes the CAM bug. The CIME bug will be addressed the next time externals are updated.

Describe any changes made to build system: N/A

Describe any changes made to the namelist: Just change default namelist settings as described below

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaume, adamher

List all files eliminated:
D README_EXTERNALS
- Remove obsolete file (discussed svn externals, which is no longer used)

List all files added and what they do:

List all existing files that have been modified, and describe the changes:
M bld/configure
- Fix from Jim to support selecting various intel compilers

M bld/namelist_files/namelist_defaults_cam.xml
- Change namelist settings to mimic Cecile's settings for cam_dev runs

M cime_config/buildnml
- Fix typo which prevented GEOS-Chem from finding yml file


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: all BFB except:


ERP_D_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details:
ERP_Ln9.f09_f09_mg17.F2000dev.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF) details:
ERS_Ld3.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam_dev (Overall: DIFF) details:
SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FCLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_Ld1.f19_f19.F2000dev.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
- Namelist and baseline differences for all cam_dev runs


ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: PEND) details:
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
- pre-existing failures

SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: FAIL) details:
- Current failure, but should be fixed when cime external is next updated

izumi/nag/aux_cam: all BFB except
DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
- pre-existing failure

izumi/gnu/aux_cam: all BFB except:
SMS_D_Ln9.f10_f10_mg37.2000_CAM%DEV%GHGMAM4_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SESP.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
- Namelist and baseline differences for all cam_dev runs

===============================================================
===============================================================
Tag name: cam6_3_152
Originator(s): pel
Expand Down

0 comments on commit 61b739e

Please sign in to comment.