Skip to content

Commit

Permalink
Merge pull request #1231 from ESMCI/mvertens/drv_flds_in
Browse files Browse the repository at this point in the history
Mvertens/drv flds in
added mct/cime_config/namelist_definition_drv_flds.xml with updated schema

removed bld directory
updated schema for namelist_definition_drv_flds.xml
put in error check that there are no duplicate entries in the drv drv_flds_in that have different values - verified that this works by having CLM change the same namelists that are set by CAM in drv_flds_in
In addition to the scripts regression test - verified that the following tests were bfb with cesm2_0_alpha06f

SMS_D_Ln9.f09_f09.FWAMIP.yellowstone_intel.cam-reduced_hist3s
ERS_Ld7.f19_g16.B1850.yellowstone_intel.allactive-defaultio
ERP_Ln9.f09_f09.FC55CLUBB.yellowstone_intel.cam-outfrq9s

Test suite: scripts_regression_test
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1217

User interface changes?: None

Code review: jedwards
  • Loading branch information
jedwards4b authored Mar 15, 2017
2 parents 5f3072c + f62db42 commit 8270602
Show file tree
Hide file tree
Showing 16 changed files with 172 additions and 2,003 deletions.
6 changes: 3 additions & 3 deletions config/acme/config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="modelio" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_modelio.xml</value>
<value component="drv_flds" >$CIMEROOT/src/drivers/mct/bld/namelist_files/namelist_definition_drv_flds.xml</value>
<value component="drv" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv.xml</value>
<value component="modelio" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_modelio.xml</value>
<value component="drv_flds">$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv_flds.xml</value>
<value component="drv" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv.xml</value>
<!-- data model components -->
<value component="drof">$CIMEROOT/src/components/data_comps/drof/cime_config/namelist_definition_drof.xml</value>
<value component="datm">$CIMEROOT/src/components/data_comps/datm/cime_config/namelist_definition_datm.xml</value>
Expand Down
6 changes: 3 additions & 3 deletions config/cesm/config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="modelio" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_modelio.xml</value>
<value component="drv_flds" >$CIMEROOT/src/drivers/mct/bld/namelist_files/namelist_definition_drv_flds.xml</value>
<value component="drv" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv.xml</value>
<value component="modelio" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_modelio.xml</value>
<value component="drv_flds">$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv_flds.xml</value>
<value component="drv" >$CIMEROOT/src/drivers/mct/cime_config/namelist_definition_drv.xml</value>
<!-- data model components -->
<value component="drof">$CIMEROOT/src/components/data_comps/drof/cime_config/namelist_definition_drof.xml</value>
<value component="datm">$CIMEROOT/src/components/data_comps/datm/cime_config/namelist_definition_datm.xml</value>
Expand Down
9 changes: 0 additions & 9 deletions src/drivers/mct/bld/namelist_files/namelist_defaults_drv.xml

This file was deleted.

17 changes: 0 additions & 17 deletions src/drivers/mct/bld/namelist_files/namelist_definition_drv.xml

This file was deleted.

131 changes: 0 additions & 131 deletions src/drivers/mct/bld/namelist_files/namelist_definition_drv_flds.xml

This file was deleted.

122 changes: 0 additions & 122 deletions src/drivers/mct/bld/namelist_files/namelist_definition_modio.xml

This file was deleted.

9 changes: 0 additions & 9 deletions src/drivers/mct/bld/testdir/Buildconf/camconf/drv_flds_in

This file was deleted.

9 changes: 0 additions & 9 deletions src/drivers/mct/bld/testdir/Buildconf/clmconf/drv_flds_in

This file was deleted.

Loading

0 comments on commit 8270602

Please sign in to comment.