Skip to content

Commit

Permalink
update ChangeLog, pull hvcoord addition
Browse files Browse the repository at this point in the history
  • Loading branch information
jtruesdal committed Aug 26, 2024
1 parent 40f6c5c commit c50362c
Show file tree
Hide file tree
Showing 13 changed files with 147 additions and 184 deletions.
146 changes: 73 additions & 73 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Tag name: cam6_4_023
Originator(s): jet
Date: Aug 23, 2024
Date: Aug 26, 2024
One-line Summary: cam6_4_023: SCAM-SE feature addition plus bugfixes and some refactoring
Github PR URL: https://github.com/ESCOMP/CAM/pull/958

Expand All @@ -26,25 +26,29 @@ The SCAM-SE vertical advection skips the horizontal step and derives the floatin
based on the IOP prescribed vertical velocity. The floating levels are subsequently remapped at
the end of the vertically Lagrangian dynamics step.

Closes Issue SCAM-SE - Allow use of spectral elements dycore in single column mode. #957
Closes Issue some SCAM IOP's are broken #853
Closes Issue Unhelpful error message when running SCAM and IOP file is too short #742

Describe any changes made to build system: Allow SCAM to be built with spectral element dycore

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets:New boundary data for SE SCM
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-09-01-00000.nc
A atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc
A atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc
A atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc
A atm/cam/chem/trop_mam/atmsrf_ne3np4_230718.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-01-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-02-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-04-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-08-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-10-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-12-01-00000.nc
A atm/cam/scam/iop/micre2017_3mo.cam.i.2017-01-01-00000.regrid.ne3np4.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-09-01-00000.nc
A atm/cam/inic/se/cami_0000-01-01_ne3np4_L30_c120315.nc
A atm/cam/inic/se/cami_0000-01-01_ne3np4_L26_c120525.nc
A atm/cam/topo/se/ne3np4_gmted2010_modis_bedmachine_nc0540_Laplace1000_noleak_20230717.nc
A atm/cam/chem/trop_mam/atmsrf_ne3np4_230718.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-01-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-02-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-04-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-07-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-08-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-10-01-00000.nc
A atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-12-01-00000.nc
A atm/cam/scam/iop/micre2017_3mo.cam.i.2017-01-01-00000.regrid.ne3np4.nc

Describe any substantial timing or memory changes: N/A

Expand Down Expand Up @@ -112,97 +116,96 @@ List all files added and what they do: N/A

A src/dynamics/se/apply_iop_forcing.F90
A src/dynamics/se/dycore/se_single_column_mod.F90
A src/utils/hybvcoord_mod.F90
- enable iop forcing for SE SCM

List all existing files that have been modified, and describe the changes:
M .gitmodules
M .gitmodules
- update cice to fix scam failure
- update cdeps to fix CDEPS regression test build failures
M bld/build-namelist
M bld/build-namelist
- update namelist defaults for scm relaxation.
M bld/config_files/definition.xml
M bld/config_files/definition.xml
- new configurations option for scam_iops
M bld/configure
M bld/configure
- new configure options for SCAM refactor
M bld/namelist_files/namelist_defaults_cam.xml
M bld/namelist_files/namelist_definition.xml
M bld/namelist_files/namelist_defaults_cam.xml
M bld/namelist_files/namelist_definition.xml
- new configurations option for scam_iops
M cime_config/buildcpp
M cime_config/buildcpp
- setup new build for se SCAM test
M cime_config/config_component.xml
M cime_config/config_compsets.xml
M cime_config/config_component.xml
M cime_config/config_compsets.xml
- add scam defaults to cime
M cime_config/config_pes.xml
M cime_config/config_pes.xml
- add scam se pe defaults
M cime_config/SystemTests/sct.py
M cime_config/SystemTests/sct.py
- setup new BFB se SCAM test
M cime_config/testdefs/testlist_cam.xml
M cime_config/testdefs/testlist_cam.xml
- fix mpace test and add test_scam category
M cime_config/testdefs/testmods_dirs/cam/scmarm/shell_commands
M cime_config/testdefs/testmods_dirs/cam/scmarm/shell_commands
- add new scam se regression tests
M cime_config/usermods_dirs/scam_mandatory/shell_commands
M cime_config/usermods_dirs/scam_mandatory/shell_commands
- add warmstart logic
M src/control/cam_comp.F90
M src/control/cam_comp.F90
- cleanup some of the BFB_CAM_SCAM_IOP cppdefs
M src/control/cam_history.F90
M src/control/cam_history.F90
- set write_camiop logical if CAMIOP history type is requested by user.
M src/control/getinterpnetcdfdata.F90
M src/control/history_scam.F90
M src/control/getinterpnetcdfdata.F90
M src/control/history_scam.F90
- generalize for output on single column grid
M src/control/ncdio_atm.F90
M src/control/ncdio_atm.F90
- add physgrid_scm, scam uses the full physgrid to read data from boundary and
M src/control/scamMod.F90
M src/control/scamMod.F90
- new control parameters for SCAM-SE
M src/dynamics/eul/diag_dynvar_ic.F90
M src/dynamics/eul/dyn_comp.F90
M src/dynamics/eul/dynpkg.F90
M src/dynamics/eul/diag_dynvar_ic.F90
M src/dynamics/eul/dyn_comp.F90
M src/dynamics/eul/dynpkg.F90
- remove more scam CPP defines
M src/dynamics/eul/dyn_grid.F90
M src/dynamics/eul/iop.F90
M src/dynamics/eul/dyn_grid.F90
M src/dynamics/eul/iop.F90
- generalize to use common routines for SE and EUL
M src/dynamics/eul/restart_dynamics.F90
M src/dynamics/eul/restart_dynamics.F90
- remove more scam CPP defines
M src/dynamics/eul/scmforecast.F90
M src/dynamics/eul/stepon.F90
M src/dynamics/eul/tfilt_massfix.F90
M src/dynamics/eul/scmforecast.F90
M src/dynamics/eul/stepon.F90
M src/dynamics/eul/tfilt_massfix.F90
- refactor/cleanup
M src/dynamics/se/advect_tend.F90
M src/dynamics/se/advect_tend.F90
- capture SE advective tendencies for BFB testing
M src/dynamics/se/dp_coupling.F90
M src/dynamics/se/dp_coupling.F90
- phys/dyn interface additions for SE-SCAM
M src/dynamics/se/dycore/prim_advance_mod.F90
M src/dynamics/se/dycore/prim_driver_mod.F90
M src/dynamics/se/dycore/vertremap_mod.F90
M src/dynamics/se/dycore/viscosity_mod.F90
M src/dynamics/se/dycore/prim_advance_mod.F90
M src/dynamics/se/dycore/prim_driver_mod.F90
M src/dynamics/se/dycore/vertremap_mod.F90
M src/dynamics/se/dycore/viscosity_mod.F90
- refactor/cleanup
M src/dynamics/se/dyn_comp.F90
M src/dynamics/se/dyn_grid.F90
M src/dynamics/se/dyn_comp.F90
M src/dynamics/se/dyn_grid.F90
- add SE single column mod
M src/dynamics/se/gravity_waves_sources.F90
M src/dynamics/se/gravity_waves_sources.F90
- hvcoord
M src/dynamics/se/stepon.F90
M src/dynamics/se/stepon.F90
- add SE SCAM iop update calls
M src/infrastructure/phys_grid.F90
M src/infrastructure/phys_grid.F90
- update for single column phys grid
M src/physics/cam7/physpkg.F90
M src/physics/cam/cam_diagnostics.F90
M src/physics/cam7/physpkg.F90
M src/physics/cam/cam_diagnostics.F90
- clean up BFB cpp defs
M src/physics/cam/check_energy.F90
M src/physics/cam/check_energy.F90
- add heat_glob for SE iop
M src/physics/cam/chem_surfvals.F90
M src/physics/cam/chem_surfvals.F90
- add column initialization for greenhouse gasses
M src/physics/cam/clubb_intr.F90
M src/physics/cam/clubb_intr.F90
- use model grid box size not arbitrary SCM column size
M src/physics/cam/convect_shallow.F90
M src/physics/cam/convect_shallow.F90
- add DQP diagnostic
M src/physics/cam/phys_grid.F90
M src/physics/cam/phys_grid.F90
- define scm single column grid for scm history
M src/physics/cam/physpkg.F90
M src/physics/cam/physpkg.F90
- clean up BFB cpp defs
M src/utils/cam_grid_support.F90
M src/utils/cam_grid_support.F90
- add trim to grid name
M src/utils/hycoef.F90
M src/utils/hycoef.F90
- add hvcoord struct


Expand All @@ -220,15 +223,12 @@ derecho/intel/aux_cam:
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details:
- pre-existing pend/failures -- need fix in CLM external

SCT_D_Ln7.ne3_ne3_mg37.QPC5.derecho_intel.cam-scm_prep (Overall: FAIL)
SCT_D_Ln7.ne3_ne3_mg37.QPC5.derecho_intel.cam-scm_prep BFAIL
- New Test; Failure expected (SCAM on spectral element grid)

SMS_D_Ln9.T42_T42.FSCAMARM97.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
SMS_D_Ln9.T42_T42.FSCAMARM97.derecho_intel.cam-outfrq9s BFAIL
- New Test; Failure expected; FSCAM compset named changed to FSCAMARM97

SMS_D_Ln9.T42_T42.FSCAMARM97.derecho_intel.cam-outfrq9s (Overall: FAIL)
- New Test name; Failure expected (FSCAM->FSCAMARM97)

SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep (Overall: DIFF) details:
- Roundoff answer changes expected to existing SCAM prep cases

Expand Down Expand Up @@ -273,8 +273,8 @@ derecho/intel/aux_cam:
- Expected failures, In addition to differences these tests also failed namelist comparisons due to the updated cice

derecho/nvhpc/aux_cam:
ERS_Ln9_G4-a100-openacc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_mg3_default (Overall: DIFF) details:
- Roundoff answer changes expected
ERS_Ln9_G4-a100-openacc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_mg3_default (Overall: NLFAIL)
- Expected failures due to the updated cice

izumi/nag/aux_cam:
DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
Expand Down
Loading

0 comments on commit c50362c

Please sign in to comment.