Skip to content

Commit

Permalink
Merge esmci_remote_for_split/master
Browse files Browse the repository at this point in the history
* esmci_remote_for_split/master: (1282 commits)
  Remove "category" element from expected fails file
  Reorder elements in expected_fails_file.xsd
  Revert the change for netcdf4
  Squashed 'src/externals/pio1/' changes from b4e6d54..7da5627
  Fix pylint issue
  Add a schema for the expected fails xml file
  Changes for PGI 18.4
  Fixes
  Fix important bug in case.build
  Add pylint ignore
  Fix Case context manager enforcement
  moving this to another pr
  avoid variable name overload
  remove comment
  remove comment
  commit correct fix undo bad fix
  remove unneeded declaration
  buildlib needs a flush and docn_comp_mod needs fix for optional variable
  update to pio 130c564
  Remove support for CLM4.0
  ...

# Conflicts:
#	config/cesm/config_grids.xml
#	config/cesm/machines/config_machines.xml
#	scripts/lib/CIME/case/case_clone.py
#	scripts/testlist_cmeps.xml
#	scripts/tests/scripts_regression_tests.py
#	src/components/data_comps/docn/nuopc/docn_comp_mod.F90
#	src/drivers/nuopc/cime_config/namelist_definition_drv.xml
#	src/drivers/nuopc/mediator/med_map_mod.F90
#	src/drivers/nuopc/mediator/med_merge_mod.F90
#	src/drivers/nuopc/mediator/med_phases_aofluxes_mod.F90
#	src/drivers/nuopc/mediator/med_phases_mod.F90
#	src/drivers/nuopc/mediator/med_phases_prep_atm_mod.F90
#	src/drivers/nuopc/mediator/med_phases_prep_ice_mod.F90
#	src/drivers/nuopc/mediator/med_phases_prep_ocn_mod.F90
#	src/drivers/nuopc/mediator/med_phases_profile_mod.F90
#	src/drivers/nuopc/shr/shr_nuopc_grid_mod.F90
#	src/drivers/nuopc/shr/shr_nuopc_methods_mod.F90
#	src/share/timing/perf_mod.F90
  • Loading branch information
jgfouca committed Jan 14, 2019
2 parents 49ce21a + dc85986 commit b4f1012
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions driver-mct/cime_config/config_component_cesm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -528,16 +528,11 @@

<entry id="GLC_NEC">
<type>integer</type>
<valid_values>0,1,3,5,10,36</valid_values>
<valid_values>1,3,5,10,36</valid_values>
<default_value>10</default_value>
<values match="last">
<value compset="_CLM40.*_SGLC">0</value>
</values>
<group>run_glc</group>
<file>env_run.xml</file>
<desc>Number of glacier elevation classes used in CLM.
0 implies no glacier_mec (glacier multiple elevation classes)
landunit in CLM. 0 is only valid for CLM40.
Used by both CLM and the coupler (even if CISM is not running, and only SGLC is used).</desc>
</entry>

Expand All @@ -546,8 +541,7 @@
<valid_values>TRUE,FALSE</valid_values>
<default_value>FALSE</default_value>
<values match="last">
<value compset="_CLM45.+CISM\d">TRUE</value>
<value compset="_CLM50.+CISM\d">TRUE</value>
<value compset="_CLM.+CISM\d">TRUE</value>
<!-- Turn on two-way coupling for TG compsets - even though there are no
feedbacks for a TG compset, this will give us additional diagnostics -->
<value compset="_DLND.+CISM\d">TRUE</value>
Expand Down

0 comments on commit b4f1012

Please sign in to comment.