Skip to content

Commit

Permalink
Merge branch 'rljacob/cime/cime5-upgrade' (PR #1169)
Browse files Browse the repository at this point in the history
Upgrade ACME's version of CIME from v2 to v5.1.

Introduce new python versions of all user-interface functions.
Introduce new xml-format for most case and config xml files.
Nearly all internal code has been converted to python.

Fixes #373
Fixes #967

[BFB] except for IG cases because of changes to vertical remapping.

Conflicts resolved by removing the old mpas-cice and mpas-o
buildnaml and commit beta0 version with necessary cime5 changes.
Removed old config_grid.xml
Also converted AVIC-L to use beta0 settings in cam
config_component.xml
  • Loading branch information
rljacob committed Dec 12, 2016
2 parents 53b7456 + 2d37fab commit 1f32d66
Show file tree
Hide file tree
Showing 180 changed files with 5,473 additions and 7,858 deletions.
6 changes: 3 additions & 3 deletions components/data_comps/datm/atm_comp_esmf.F90
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module atm_comp_esmf

#ifdef ESMF_INTERFACE
#ifdef ESMF_INTERFACE
use shr_kind_mod, only: R8=>SHR_KIND_R8, IN=>SHR_KIND_IN, &
CS=>SHR_KIND_CS, CL=>SHR_KIND_CL
use shr_sys_mod ! shared system calls
Expand Down Expand Up @@ -37,7 +37,7 @@ module atm_comp_esmf
save ! save everything
!
! Author: Fei Liu
! This module is ESMF compliant atm data component
! This module is ESMF compliant atm data component
!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
contains
!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -256,7 +256,7 @@ subroutine atm_final_esmf(comp, import_state, export_state, EClock, rc)
integer, intent(out) :: rc

!----------------------------------------------------------------------------
! Finalize routine
! Finalize routine
!----------------------------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down
158 changes: 82 additions & 76 deletions components/data_comps/datm/bld/build-namelist

Large diffs are not rendered by default.

34 changes: 0 additions & 34 deletions components/data_comps/datm/bld/datm.buildlib

This file was deleted.

90 changes: 0 additions & 90 deletions components/data_comps/datm/bld/datm.buildnml

This file was deleted.

Loading

0 comments on commit 1f32d66

Please sign in to comment.