Skip to content

Commit

Permalink
Merge pull request #260 from mvertens/remove_esmf_interface
Browse files Browse the repository at this point in the history
Remove esmf interface
  • Loading branch information
jedwards4b authored Jul 14, 2016
2 parents 8fa604a + 766f974 commit bbf9ba7
Show file tree
Hide file tree
Showing 21 changed files with 256 additions and 5,637 deletions.
34 changes: 34 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
======================================================================

Originator: mvertens
Date: July 9, 2016
Tag: cime4.5.23
Answer Changes: None
Tests: Ran prealph intel tests and compared to cesm1_5_alpha07e
Dependencies: None

Brief Summary: Removed all code related to using the ESMF interfaces

Modified files: git diff --name-status

M cime_config/cesm/config_grids.xml
M driver_cpl/cime_config/config_component.xml
M driver_cpl/driver/cesm_comp_mod.F90
M driver_cpl/driver/cesm_driver.F90
M driver_cpl/driver/component_mod.F90
M driver_cpl/driver/component_type_mod.F90
M driver_cpl/driver/seq_diag_mct.F90
M driver_cpl/driver/seq_map_mod.F90
M driver_cpl/driver/seq_map_type_mod.F90
M driver_cpl/shr/seq_comm_mct.F90

Deleted files:

D driver_cpl/driver/cpl_comp_esmf.F90
D driver_cpl/driver/seq_map_esmf.F90
D driver_cpl/shr_esmf/esmf2mct_mod.F90
D driver_cpl/shr_esmf/esmfshr_attribute_mod.F90
D driver_cpl/shr_esmf/esmfshr_infodata_mod.F90
D driver_cpl/shr_esmf/esmfshr_mod.F90
D driver_cpl/shr_esmf/esmfshr_util_mod.F90
D driver_cpl/shr_esmf/mct2esmf_mod.F90
======================================================================

Originator: fischer-ncar
Date: July 7, 2016
Tag: cime4.5.22
Expand Down
396 changes: 198 additions & 198 deletions cime_config/cesm/allactive/config_compsets.xml

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions cime_config/cesm/allactive/testlist_allactive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,6 @@
</options>
</machines>
</test>
<test name="NOC" grid="f09_g16" compset="B1850" testmods="allactive/defaultio">
<machines>
<machine name="yellowstone" compiler="intel" category="prealpha"/>
<machine name="yellowstone" compiler="intel" category="prebeta"/>
<options>
<option name="wallclock"> 00:20 </option>
</options>
</machines>
</test>
<test name="PEA_P1" grid="f45_g37" compset="B1850" testmods="allactive/defaultio">
<machines>
<machine name="hobart" compiler="intel" category="prebeta"/>
Expand Down
4 changes: 2 additions & 2 deletions driver_cpl/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -680,11 +680,11 @@

<entry id="COMP_INTERFACE">
<type>char</type>
<valid_values>MCT,ESMF</valid_values>
<valid_values>MCT</valid_values>
<default_value>MCT</default_value>
<group>build_def</group>
<file>env_build.xml</file>
<desc>use MCT or ESMF component interfaces</desc>
<desc>use MCT component interface</desc>
</entry>

<entry id="USE_ESMF_LIB">
Expand Down
Loading

0 comments on commit bbf9ba7

Please sign in to comment.