Skip to content

Commit

Permalink
ESCOMP tag: cam6_4_067
Browse files Browse the repository at this point in the history
Merge pull request ESCOMP#1217 from brian-eaton/rm-spcam

cam6_4_067: Remove SPCAM

ESCOMP commit: a01a051
  • Loading branch information
brian-eaton authored and Steve Goldhaber committed Feb 22, 2025
1 parent 2e3ca56 commit 6548bdd
Show file tree
Hide file tree
Showing 194 changed files with 217 additions and 99,665 deletions.
12 changes: 0 additions & 12 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2057,18 +2057,6 @@
<overrides>
<grid name="any" >
<mach name="any" >
<pes pesize="any" compset="SPCAM[SM]">
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
<pes pesize="any" compset="SCAM.*">
<comment>none</comment>
<ntasks>
Expand Down
135 changes: 135 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,140 @@
===============================================================

Tag name: cam6_4_067
Originator(s): eaton
Date: 15 February 2025
One-line Summary: Remove SP-CAM
Github PR URL: https://github.com/ESCOMP/CAM/pull/1217

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

Resolve #1171 - Remove SP-CAM from cam_development

Describe any changes made to build system:
. remove spcam build options

Describe any changes made to the namelist:
. remove spcam namelist options

List any changes to the defaults for the boundary datasets: none

Describe any substantial timing or memory changes: none

Code reviewed by: cacraig

List all files eliminated:
doc/ReleaseNotes
. This file hasn't been updated since cam5.4. Put this information
somewhere else.

src/physics/cam/spcam_drivers.F90
src/physics/spcam/*
src/physics/spcam/crm/*
src/physics/spcam/crm/ADV_MPDATA/*
src/physics/spcam/crm/CLUBB/*
src/physics/spcam/crm/MICRO_M2005/*
src/physics/spcam/crm/MICRO_SAM1MOM/*
src/physics/spcam/crm/SGS_CLUBBkvhkvm/*
src/physics/spcam/crm/SGS_TKE/*
src/physics/spcam/ecpp/*
. remove all SPCAM source and drivers

List all files added and what they do: none

List all existing files that have been modified, and describe the changes:

bld/build-namelist
. remove dependencies on spcam

bld/config_files/definition.xml
. remove 'phys' options spcam_sam1mom and spcam_m2005
. remove 'microphys' options spcam_sam1mom and spcam_m2005
. remove 'macrophys' options spcam_sam1mom and spcam_m2005
. remove 'pbl' options spcam_sam1mom and spcam_m2005
. remove parameters 'spcam_clubb_sgs', 'spcam_nx', 'spcam_ny', 'spcam_nz',
'spcam_dx', 'spcam_dt'

bld/configure
. remove -phys options spcam_sam1mom and spcam_m2005
. remove commandline options -spcam_clubb_sgs, -spcam_nx, -spcam_ny,
-spcam_dx, -spcam_dt
. remove code paths for spcam:
src/physics/spcam/
src/physics/spcam/crm/
src/physics/spcam/crm/ADV_MPDATA/
src/physics/spcam/crm/MICRO_SAM1MOM/
src/physics/spcam/crm/MICRO_M2005/
src/physics/spcam/crm/CLUBB/
src/physics/spcam/crm/SGS_CLUBBkvhkvm/
src/physics/spcam/crm/SGS_TKE/
src/physics/spcam/ecpp/

bld/namelist_files/namelist_defaults_cam.xml
. remove dependencies on phys, microphys, macrophys, and pbl attributes
spcam_sam1mom and spcam_m2005
. remove dependencies on spcam_clubb_sgs attribute

bld/namelist_files/namelist_definition.xml
. remove SPCAM_sam1mom and SPCAM_m2005 as valid values for microp_scheme,
shallow_scheme, and eddy_scheme

cime_config/config_component.xml
. remove physics options %SPCAMS, %SPCAMCLBS, %SPCAMM, %SPCAMCLBM

cime_config/config_compsets.xml
. remove F2000Nuopc - not used
. remove QSPCAMS, QPSPCAMM, FSPCAMM, FSPCAMS
. remove FSPCAMCLBS, FSPCAMCLBM
. remove SPCAM settings for NTHRDS_[ATM,CPL,ESP,GLC,ICE,LND,OCN,ROF,WAV]

cime_config/config_pes.xml
. remove settings for SPCAM*

cime_config/testdefs/testlist_cam.xml
. remove tests for SPCAM*

src/chemistry/modal_aero/aero_model.F90
src/physics/cam/cloud_diagnostics.F90
src/physics/cam/cloud_fraction.F90
src/physics/cam/conv_water.F90
src/physics/cam/convect_deep.F90
src/physics/cam/convect_shallow.F90
src/physics/cam/diffusion_solver.F90
src/physics/cam/microp_driver.F90
src/physics/cam/ndrop.F90
src/physics/cam/phys_control.F90
src/physics/cam/physpkg.F90
src/physics/cam/pkg_cldoptics.F90
src/physics/cam/vertical_diffusion.F90
. remove dependecies on SPCAM_sam1mom and SPCAM_m2005

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:
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
- pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)

SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update

derecho/nvhpc/aux_cam: All PASS

izumi/nag/aux_cam: All PASS

izumi/gnu/aux_cam: All PASS

CAM tag used for the baseline comparison tests if different than previous
tag:

Summarize any changes to answers: BFB

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

Tag name: cam6_4_066
Originator(s): fvitt
Date: 14 Feb 2025
Expand Down
Loading

0 comments on commit 6548bdd

Please sign in to comment.