Merge pull request #89 from ESMCI/jedwards/mergetob896c79

Jedwards/mergetob896c79
E3SM-Project · May 7, 2019 · 464a003 · 464a003
2 parents 303a4b3 + ffff255
commit 464a003
Show file tree

Hide file tree

Showing 29 changed files with 851 additions and 363 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,283 @@
 ======================================================================
 
+Originator: Chris Fischer 
+Date: 4-23-2019
+Tag: cime5.8.2
+Answer Changes: None
+Tests: scripts_regression_tests
+Dependencies:
+
+Brief Summary:
+    - Update the ne0CONUSne30x8 mapping files.
+    - Allow specific tests to ignore field list differences.
+    - Add NLDAS grid for CTSM and MOSART.
+    - Merge branch for acme split 2019-04-15
+    - Fix unit test.
+    - Introduces a new stub IAC.
+    - Master merge to nuopc cmeps.
+
+User interface changes: 
+
+PR summary: git log --oneline --first-parent [previous_tag]..master
+57cf4a5 Merge pull request #3086 from ESMCI/fischer/ne_conus
+421cc98 Merge pull request #3084 from billsacks/cprnc_ignore_fieldlist_diffs
+a356310 Merge pull request #3063 from billsacks/nldas_grid_v2
+14babd5 Merge pull request #3079 from ESMCI/jgfouca/branch-for-acme-split-2019-04-15
+74730fe fix for unit test
+4e86cc0 Merge pull request #3055 from bishtgautam/bishtgautam/iac
+279d30a Merge pull request #3075 from jedwards4b/master-merge-to-nuopc-cmeps
+
+
+Modified files: git diff --name-status [previous_tag]
+M	config/cesm/config_files.xml
+M	config/cesm/config_grids.xml
+M	config/cesm/config_grids_common.xml
+M	config/cesm/config_grids_mct.xml
+M	config/cesm/machines/config_machines.xml
+M	config/e3sm/allactive/config_compsets.xml
+M	config/e3sm/allactive/config_pesall.xml
+M	config/e3sm/config_archive.xml
+M	config/e3sm/config_files.xml
+M	config/e3sm/config_grids.xml
+M	config/e3sm/machines/config_batch.xml
+M	config/e3sm/machines/config_compilers.xml
+M	config/e3sm/machines/config_machines.xml
+M	config/e3sm/machines/config_pio.xml
+M	config/e3sm/tests.py
+M	config/xml_schemas/entry_id_base_version3.xsd
+M	scripts/Tools/Makefile
+M	scripts/Tools/archive_metadata
+M	scripts/Tools/case.build
+M	scripts/Tools/xmlconvertors/config_pes_converter.py
+M	scripts/Tools/xmlconvertors/grid_xml_converter.py
+M	scripts/lib/CIME/Servers/wget.py
+M	scripts/lib/CIME/SystemTests/system_tests_common.py
+M	scripts/lib/CIME/SystemTests/system_tests_compare_two.py
+M	scripts/lib/CIME/XML/grids.py
+M	scripts/lib/CIME/case/case.py
+M	scripts/lib/CIME/case/case_submit.py
+M	scripts/lib/CIME/hist_utils.py
+M	scripts/lib/CIME/tests/SystemTests/test_system_tests_compare_two.py
+M	src/components/data_comps/datm/nuopc/atm_comp_nuopc.F90
+M	src/components/data_comps/datm/nuopc/datm_comp_mod.F90
+M	src/components/data_comps/datm/nuopc/datm_shr_mod.F90
+M	src/components/data_comps/dice/nuopc/dice_comp_mod.F90
+M	src/components/data_comps/dice/nuopc/dice_shr_mod.F90
+M	src/components/data_comps/dice/nuopc/ice_comp_nuopc.F90
+M	src/components/data_comps/dlnd/nuopc/dlnd_comp_mod.F90
+M	src/components/data_comps/dlnd/nuopc/dlnd_shr_mod.F90
+M	src/components/data_comps/dlnd/nuopc/lnd_comp_nuopc.F90
+M	src/components/data_comps/docn/nuopc/docn_comp_mod.F90
+M	src/components/data_comps/docn/nuopc/docn_shr_mod.F90
+M	src/components/data_comps/docn/nuopc/ocn_comp_nuopc.F90
+M	src/components/data_comps/drof/nuopc/drof_comp_mod.F90
+M	src/components/data_comps/drof/nuopc/rof_comp_nuopc.F90
+M	src/components/data_comps/dshr_nuopc/dshr_nuopc_mod.F90
+M	src/components/data_comps/dwav/nuopc/dwav_comp_mod.F90
+M	src/components/data_comps/dwav/nuopc/dwav_shr_mod.F90
+M	src/components/data_comps/dwav/nuopc/wav_comp_nuopc.F90
+A	src/components/stub_comps/siac/cime_config/buildlib
+A	src/components/stub_comps/siac/cime_config/buildnml
+A	src/components/stub_comps/siac/cime_config/config_component.xml
+A	src/components/stub_comps/siac/mct/iac_comp_mct.F90
+M	src/components/xcpl_comps/xatm/nuopc/atm_comp_nuopc.F90
+M	src/components/xcpl_comps/xglc/nuopc/glc_comp_nuopc.F90
+M	src/components/xcpl_comps/xice/nuopc/ice_comp_nuopc.F90
+M	src/components/xcpl_comps/xlnd/nuopc/lnd_comp_nuopc.F90
+M	src/components/xcpl_comps/xocn/nuopc/ocn_comp_nuopc.F90
+M	src/components/xcpl_comps/xrof/nuopc/rof_comp_nuopc.F90
+M	src/components/xcpl_comps/xshare/nuopc/dead_nuopc_mod.F90
+M	src/components/xcpl_comps/xwav/nuopc/wav_comp_nuopc.F90
+M	src/drivers/mct/cime_config/buildexe
+M	src/drivers/mct/cime_config/config_component.xml
+M	src/drivers/mct/cime_config/config_component_e3sm.xml
+M	src/drivers/mct/cime_config/config_compsets.xml
+M	src/drivers/mct/cime_config/config_pes.xml
+M	src/drivers/mct/cime_config/namelist_definition_drv.xml
+M	src/drivers/mct/cime_config/namelist_definition_modelio.xml
+M	src/drivers/mct/main/cime_comp_mod.F90
+M	src/drivers/mct/main/component_mod.F90
+M	src/drivers/mct/main/component_type_mod.F90
+M	src/drivers/mct/main/prep_atm_mod.F90
+A	src/drivers/mct/main/prep_iac_mod.F90
+M	src/drivers/mct/main/prep_lnd_mod.F90
+M	src/drivers/mct/main/seq_frac_mct.F90
+M	src/drivers/mct/main/seq_hist_mod.F90
+M	src/drivers/mct/main/seq_rest_mod.F90
+M	src/drivers/mct/shr/seq_comm_mct.F90
+M	src/drivers/mct/shr/seq_flds_mod.F90
+M	src/drivers/mct/shr/seq_infodata_mod.F90
+M	src/drivers/mct/shr/seq_timemgr_mod.F90
+M	src/drivers/mct/unit_test/CMakeLists.txt
+M	src/drivers/nuopc/cime_config/buildnml
+M	src/drivers/nuopc/cime_config/config_component.xml
+M	src/drivers/nuopc/cime_config/config_component_cesm.xml
+M	src/drivers/nuopc/cime_config/nuopc_runseq_A
+M	src/drivers/nuopc/cime_config/nuopc_runseq_ADLND
+M	src/drivers/nuopc/cime_config/nuopc_runseq_ADWAV
+M	src/drivers/nuopc/cime_config/nuopc_runseq_B
+D	src/drivers/nuopc/cime_config/nuopc_runseq_C_G_D
+A	src/drivers/nuopc/cime_config/nuopc_runseq_C_G_D_swav
+A	src/drivers/nuopc/cime_config/nuopc_runseq_C_G_D_ww3
+A	src/drivers/nuopc/cime_config/nuopc_runseq_C_wav
+M	src/drivers/nuopc/cime_config/nuopc_runseq_F
+M	src/drivers/nuopc/cime_config/nuopc_runseq_I
+M	src/drivers/nuopc/cime_config/nuopc_runseq_I_mosart
+M	src/drivers/nuopc/cime_config/nuopc_runseq_NEMS
+A	src/drivers/nuopc/cime_config/nuopc_runseq_NEMS.cold
+A	src/drivers/nuopc/cime_config/nuopc_runseq_NEMS.warm
+M	src/drivers/nuopc/cime_config/nuopc_runseq_Q
+M	src/drivers/nuopc/cime_config/nuopc_runseq_X
+M	src/drivers/nuopc/cime_config/nuopc_runseq_default
+M	src/drivers/nuopc/cime_driver/esmApp.F90
+M	src/drivers/nuopc/cime_flds/esmFlds.F90
+M	src/drivers/nuopc/cime_flds/esmFldsExchange.F90
+M	src/drivers/nuopc/cime_flds/fd.yaml
+M	src/drivers/nuopc/cime_flds_shr/seq_drydep_mod.F90
+M	src/drivers/nuopc/cime_flds_shr/shr_carma_mod.F90
+M	src/drivers/nuopc/cime_flds_shr/shr_fire_emis_mod.F90
+M	src/drivers/nuopc/cime_flds_shr/shr_megan_mod.F90
+M	src/drivers/nuopc/cime_flds_shr/shr_ndep_mod.F90
+M	src/drivers/nuopc/mediator/med.F90
+D	src/drivers/nuopc/mediator/med_connectors_mod.F90
+M	src/drivers/nuopc/mediator/med_fraction_mod.F90
+D	src/drivers/nuopc/mediator/med_infodata_mod.F90
+M	src/drivers/nuopc/mediator/med_internalstate_mod.F90
+M	src/drivers/nuopc/mediator/med_io_mod.F90
+M	src/drivers/nuopc/mediator/med_map_mod.F90
+M	src/drivers/nuopc/mediator/med_merge_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_aofluxes_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_history_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_ocnalb_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_atm_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_glc_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_ice_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_lnd_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_ocn_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_rof_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_prep_wav_mod.F90
+M	src/drivers/nuopc/mediator/med_phases_restart_mod.F90
+M	src/drivers/nuopc/shr/med_constants_mod.F90
+D	src/drivers/nuopc/shr/shr_nuopc_grid_mod.F90
+M	src/drivers/nuopc/shr/shr_nuopc_methods_mod.F90
+M	src/drivers/nuopc/shr/shr_nuopc_utils_mod.F90
+M	src/share/streams/shr_strdata_mod.F90
+M	src/share/util/shr_pio_mod.F90
+
+======================================================================
+
+======================================================================
+
+Originator: Chris Fischer 
+Date: 04-08-2019
+Tag: cime5.8.1
+Answer Changes: None
+Tests: scripts_regression_tests, many create_newcase with mangled compset names 
+       hand test xmllint
+Dependencies:
+
+Brief Summary:
+    - Support optional components by filling in stub models for any missing component class
+    - Merge maint-5.6 branch.
+    - Fix issue with xmllint.
+    - Use installed pio libraries.
+    - Make FIELDLIST message more informative.
+    - ACME merge 2019-03-29
+    - cprnc: allow differences in field lists for time-constant fields.
+    - Merge maint-5.6 branch.
+    - Add ne0CONUSne30x8_ne0CONUSne30x8_mg17 grid alias.
+    - Merge in latest nuopc-cmeps development.
+    - The check for an rpointer.drv file did not consider multidriver mode.
+    - Fix ./case.build --clean.
+    - PET and ERP tests were not setting compile_threaded correctly.
+    - Implement 'share' field of test suites.
+
+User interface changes: 
+    - Stub components are now optional in compset long names. Also there is less order dependency.
+
+PR summary: git log --oneline --first-parent [previous_tag]..master
+444b2f4 Merge pull request #3068 from gold2718/optional_components
+c1a4c49 Merge branch 'maint-5.6'
+150c2b5 Merge pull request #3061 from jedwards4b/fix_cesm_config_files
+9b0be41 Merge pull request #3058 from jedwards4b/use_installed_libraries
+ae332d4 Merge pull request #3059 from billsacks/fieldlist_differ_message
+d94860f Merge pull request #3054 from ESMCI/jgfouca/branch-for-acme-split-2019-03-29
+95e117c Merge pull request #3051 from billsacks/cprnc_allow_timeconst_fielddiffs
+338c143 Merge pull request #3052 from ESMCI/maint-5.6
+c82a5ee Merge pull request #3048 from ESMCI/fischer/SE_grids
+1bb357c Merge pull request #3046 from jedwards4b/nuopc-cmeps
+94d6da8 Merge pull request #3045 from jedwards4b/multi_driver_continue
+9f5fb60 Merge pull request #3043 from ESMCI/jgfouca/fix_build_clean
+ff06fd0 Merge pull request #3042 from ESMCI/jedwards/pet_test_fix
+bafad7e Merge pull request #3040 from ESMCI/jgfouca/impl_share_field
+
+
+Modified files: git diff --name-status [previous_tag]
+M       config/cesm/config_files.xml
+M       config/cesm/config_grids.xml
+M       config/cesm/machines/config_compilers.xml
+M       config/cesm/machines/config_machines.xml
+M       config/cesm/machines/userdefined_laptop_template/config_compilers.xml
+M       config/e3sm/config_grids.xml
+M       config/e3sm/config_inputdata.xml
+M       config/e3sm/machines/Depends.cetus
+M       config/e3sm/machines/Depends.mira
+M       config/e3sm/machines/Depends.summit.ibm
+M       config/e3sm/machines/Depends.summitdev.ibm
+M       config/e3sm/machines/config_batch.xml
+M       config/e3sm/machines/config_compilers.xml
+M       config/e3sm/machines/config_machines.xml
+M       config/e3sm/machines/config_pio.xml
+M       config/e3sm/machines/userdefined_laptop_template/config_compilers.xml
+M       config/e3sm/tests.py
+M       config/xml_schemas/config_batch.xsd
+M       config/xml_schemas/config_compilers_v2.xsd
+M       config/xml_schemas/config_machines.xsd
+M       config/xml_schemas/env_mach_specific.xsd
+M       doc/source/users_guide/cime-config.rst
+M       doc/source/users_guide/unit_testing.rst
+M       scripts/Tools/Makefile
+M       scripts/create_test
+M       scripts/fortran_unit_testing/run_tests.py
+M       scripts/lib/CIME/BuildTools/configure.py
+M       scripts/lib/CIME/BuildTools/valuesetting.py
+M       scripts/lib/CIME/XML/entry_id.py
+M       scripts/lib/CIME/XML/generic_xml.py
+M       scripts/lib/CIME/build.py
+M       scripts/lib/CIME/case/case.py
+M       scripts/lib/CIME/case/case_submit.py
+M       scripts/lib/CIME/case/check_input_data.py
+M       scripts/lib/CIME/hist_utils.py
+M       scripts/lib/CIME/test_scheduler.py
+M       scripts/lib/get_tests.py
+M       scripts/tests/scripts_regression_tests.py
+M       src/build_scripts/buildlib.gptl
+M       src/build_scripts/buildlib.kokkos
+M       src/build_scripts/buildlib.pio
+M       src/components/data_comps/datm/cime_config/config_component.xml
+M       src/components/data_comps/datm/nuopc/datm_comp_mod.F90
+M       src/components/data_comps/desp/cime_config/config_component.xml
+M       src/drivers/mct/cime_config/namelist_definition_drv.xml
+M       src/drivers/mct/main/seq_flux_mct.F90
+M       src/drivers/mct/shr/seq_infodata_mod.F90
+M       src/share/util/shr_flux_mod.F90
+M       tools/cprnc/README
+M       tools/cprnc/compare_vars_mod.F90.in
+M       tools/cprnc/cprnc.F90
+M       tools/cprnc/filestruct.F90
+M       tools/cprnc/run_tests
+M       tools/cprnc/test_inputs/README
+A       tools/cprnc/test_inputs/multipleTimes_someTimeless_extra_and_missing.nc
+A       tools/cprnc/test_inputs/noTime_extra_and_missing.nc
+M       tools/mapping/gen_domain_files/README
+M       tools/mapping/gen_domain_files/src/gen_domain.F90
+M       tools/mapping/gen_mapping_files/runoff_to_ocn/src/Makefile
+
+======================================================================
+
+
+======================================================================
+
 Originator: Chris Fischer 
 Date: 03-12-2019
 Tag: cime5.8.0

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
@@ -121,6 +121,16 @@
       <grid name="rof">null</grid>
     </model_grid>
 
+    <!-- Regional NLDAS-2 grid over the U.S. (0.125 degree resolution;
+         25-53N, 235-293E), with mask from NLDAS-2 atmospheric drivers -->
+    <model_grid alias="nldas2_rnldas2_mnldas2" compset="DATM.+CLM">
+      <grid name="atm">0.125nldas2</grid>
+      <grid name="lnd">0.125nldas2</grid>
+      <grid name="ocnice">0.125nldas2</grid>
+      <grid name="rof">0.125nldas2</grid>
+      <mask>nldas2</mask>
+    </model_grid>
+
     <model_grid alias="hcru_hcru" compset="DATM.+CLM">
       <grid name="atm">360x720cru</grid>
       <grid name="lnd">360x720cru</grid>
@@ -1106,6 +1116,14 @@
       <desc>5x5 Amazon regional case -- only valid for DATM/CLM compset</desc>
     </domain>
 
+    <!-- This grid is also used by ROF -->
+    <domain name="0.125nldas2">
+      <nx>464</nx> <ny>224</ny>
+      <file grid="atm|lnd" mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.0.125nldas2_0.125nldas2.190410.nc</file>
+      <file grid="ocnice"  mask="nldas2">$DIN_LOC_ROOT/share/domains/domain.clm/domain.ocn.0.125nldas2.190410.nc</file>
+      <desc>Regional NLDAS-2 grid over the U.S. (0.125 degree resolution; 25-53N, 235-293E)</desc>
+    </domain>
+
     <!-- ATM/LND domains global -->
 
     <domain name="360x720cru">
@@ -1380,8 +1398,8 @@
 
     <domain name="ne0np4CONUS.ne30x8">
       <nx>174098</nx> <ny>1</ny>
-      <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne0CONUSne30x8_gx1v7.190304.nc</file>
-      <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne0CONUSne30x8_gx1v7.190304.nc</file>
+      <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne0CONUSne30x8_gx1v7.190322.nc</file>
+      <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne0CONUSne30x8_gx1v7.190322.nc</file>
       <desc>ne0np4CONUS.ne30x8 is a Spectral Elem 1-deg grid with a 1/8 deg refined region over the continental United States:</desc>
       <support>Test support only</support>
     </domain>

diff --git a/config/cesm/config_grids_common.xml b/config/cesm/config_grids_common.xml
@@ -32,8 +32,8 @@
     </gridmap>
 
     <gridmap lnd_grid="ne0np4CONUS.ne30x8" rof_grid="r05">
-      <map name="LND2ROF_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_0.5x0.5_nomask_aave.190227.nc</map>
-      <map name="ROF2LND_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_0.5x0.5_nomask_TO_ne0CONUSne30x8_aave.190227.nc</map>
+      <map name="LND2ROF_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_0.5x0.5_nomask_aave.190322.nc</map>
+      <map name="ROF2LND_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_0.5x0.5_nomask_TO_ne0CONUSne30x8_aave.190322.nc</map>
     </gridmap>
 
     <gridmap lnd_grid="360x720cru" rof_grid="r05">
@@ -288,10 +288,10 @@
     </gridmap>
 
     <gridmap lnd_grid="ne0np4CONUS.ne30x8" glc_grid="gland4" >
-      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gland4km_aave.190227.nc</map>
-      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gland4km_blin.190227.nc</map>
-      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland4km/map_gland4km_TO_ne0CONUSne30x8_aave.190227.nc</map>
-      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland4km/map_gland4km_TO_ne0CONUSne30x8_aave.190227.nc</map>
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gland4km_aave.190322.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gland4km_blin.190322.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/gland4km/map_gland4km_TO_ne0CONUSne30x8_aave.190322.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/gland4km/map_gland4km_TO_ne0CONUSne30x8_aave.190322.nc</map>
     </gridmap>
 
     <gridmap lnd_grid="ne120np4" glc_grid="gland4" >

diff --git a/config/cesm/config_grids_mct.xml b/config/cesm/config_grids_mct.xml
@@ -208,15 +208,15 @@
     </gridmap>
 
     <gridmap atm_grid="ne0np4CONUS.ne30x8" ocn_grid="gx1v7">
-      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_aave.190227.nc</map>
-      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_blin.190227.nc</map>
-      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_patc.190227.nc</map>
-      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ne0CONUSne30x8_aave.190227.nc</map>
-      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ne0CONUSne30x8_aave.190227.nc</map>
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_aave.190322.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_blin.190322.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_gx1v7_patc.190322.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ne0CONUSne30x8_aave.190322.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ne0CONUSne30x8_aave.190322.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne0np4CONUS.ne30x8" wav_grid="ww3a">
-      <map name="ATM2WAV_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_ww3a_blin.190213.nc</map>
+      <map name="ATM2WAV_SMAPNAME">cpl/gridmaps/ne0np4CONUS.ne30x8/map_ne0CONUSne30x8_TO_ww3a_blin.190322.nc</map>
     </gridmap>
 
     <gridmap atm_grid="TL319" ocn_grid="gx1v7">

diff --git a/config/cesm/machines/config_batch.xml b/config/cesm/machines/config_batch.xml
@@ -402,6 +402,7 @@
 
   <batch_system type="pbs" MACH="izumi" >
     <batch_submit>ssh izumi cd $CASEROOT ; qsub</batch_submit>
+    <jobid_pattern>(\d+.izumi.unified.ucar.edu)$</jobid_pattern>
     <directives>
       <directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
       <directive default="/bin/bash" > -S {{ shell }}  </directive>