Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1950 from ESMCI/mvertens/cplhist_topo
refactor CPLHIST mode and add DATM CPLHIST topo capability This PR has several features: 1) unifies the CPLHIST naming convention across the components by adding the following new xml variables in DATM, DLND and DOCN `DATM_CPLHIST_DOMAIN_FILE, DLND_CPLHIST_DOMAIN_FILE, DROF_CPLHIST_DOMAIN_FILE` These new xml variables are the full pathname for domain file for datm, dlnd and drof when the corresponding data model mode is set to CPLHIST. NOTE: if any of these xml variables set to 'null', then domain information is read in from the first coupler history file in the target stream. NOTE: it is assumed that when `DXXX_CPLHIST_DOMAIN_FILE='null'` that the first coupler stream file that is pointed to contains the domain information for that stream. NOTE: This is the default mode that should be used when the data model `DXXX_MODE is CPLHIST`. 2) puts in new capability for DATM CPLHIST mode to read in topo data 3) replaces % formatting in the data models with new .format() 4) address issue #1877 5) replaced `xxx_mode (e.g. atm_mode) `variables in dxxx_comp_mod.F90 and dxxx_shr_mod.F90 with `datamode `- to reduce confusion. Additional testing: Verified that using this CIME branch to replace cime/ in cesm2_0_alpha07d, the following cases ran successfully on cheyenne with data that was already there: ``` 1850_DATM%CPLHIST_CLM50%BGC_SICE_SOCN_MOSART_CISM2%NOEVOLVE_SWAV (f09_f09_mg17) the following xmlchanges neededed to be made: ./xmlchange DATM_CPLHIST_DOMAIN_FILE=null ./xmlchange DATM_CPLHIST_DIR=/glade/p/cesm/bgcwg_dev/forcing/b.e20.B1850.f09_g17.pi_control.all.179.cplhist/cpl/hist.mon ./xmlchange DATM_CPLHIST_CASE=b.e20.B1850.f09_g17.pi_control.all.179.cplhist ./xmlchange DATM_CPLHIST_YR_ALIGN=1 ./xmlchange DATM_CPLHIST_YR_START=37 ./xmlchange DATM_CPLHIST_YR_END=37 ``` ``` 1850_DATM%CPLHIST_SLND_CICE_POP2%ECO_DROF%CPLHIST_SGLC_WW3 (f09_g17) the following xmlchange commands needed to be run: ./xmlchange DATM_CPLHIST_DOMAIN_FILE=null ./xmlchange DATM_CPLHIST_DIR=/glade/p/cesm/bgcwg_dev/forcing/b.e20.B1850.f09_g17.pi_control.all.179.cplhist/cpl/hist.mon ./xmlchange DATM_CPLHIST_CASE=b.e20.B1850.f09_g17.pi_control.all.179.cplhist ./xmlchange DATM_CPLHIST_YR_ALIGN=1 ./xmlchange DATM_CPLHIST_YR_START=37 ./xmlchange DATM_CPLHIST_YR_END=37 ./xmlchange DROF_CPLHIST_DOMAIN_FILE=null ./xmlchange DROF_CPLHIST_DIR=/glade/p/cesm/bgcwg_dev/forcing/b.e20.B1850.f09_g17.pi_control.all.179.cplhist/cpl/hist.mon ./xmlchange DROF_CPLHIST_CASE=b.e20.B1850.f09_g17.pi_control.all.179.cplhist ./xmlchange DROF_CPLHIST_YR_ALIGN=1 ./xmlchange DROF_CPLHIST_YR_START=37 ./xmlchange DROF_CPLHIST_YR_END=37 ``` ``` 1850_SATM_DLND%SCPL_SICE_SOCN_SROF_CISM2%EVOLVE_SWAV (f09_g16_gl20) no xmlchange commands were needed since in this case we have DLND_CPLHIST_DOMAIN_FILE" value="$LND_DOMAIN_PATH/$LND_DOMAIN_FILE" which is obtained from the config_grids.xml file ``` Test suite: scripts_regression_tests Test baseline: did not compare against baselines Test namelist changes: None Test status: should be bfb Fixes #1877 Fixes #1407 User interface changes?: added new xml variables discussed above Update gh-pages html (Y/N)?: Y Code review: Jim Edwards, Bill Sacks
- Loading branch information