updates to fix mct build to work - now that NUOPC has been separated out

jedwards4b · Jul 18, 2017 · 74eb54b · 74eb54b
1 parent 46ac0fc
commit 74eb54b
Showing 1 changed file with 13 additions and 30 deletions.
diff --git a/src/drivers/mct/main/cesm_comp_mod.F90 b/src/drivers/mct/main/cesm_comp_mod.F90
@@ -99,16 +99,6 @@ module cesm_comp_mod
    use seq_timemgr_mod, only: seq_timemgr_alarm_wavrun
    use seq_timemgr_mod, only: seq_timemgr_alarm_esprun
    use seq_timemgr_mod, only: seq_timemgr_alarm_barrier
-   use seq_timemgr_mod, only: seq_SyncClock => seq_timemgr_SyncClock
-   use seq_timemgr_mod, only: EClock_d => seq_timemgr_Eclock_d
-   use seq_timemgr_mod, only: EClock_a => seq_timemgr_Eclock_a
-   use seq_timemgr_mod, only: EClock_l => seq_timemgr_Eclock_l
-   use seq_timemgr_mod, only: EClock_o => seq_timemgr_Eclock_o
-   use seq_timemgr_mod, only: EClock_i => seq_timemgr_Eclock_i
-   use seq_timemgr_mod, only: EClock_g => seq_timemgr_Eclock_g
-   use seq_timemgr_mod, only: EClock_r => seq_timemgr_Eclock_r
-   use seq_timemgr_mod, only: EClock_w => seq_timemgr_Eclock_w
-   use seq_timemgr_mod, only: EClock_e => seq_timemgr_Eclock_e
    use seq_timemgr_mod, only: seq_timemgr_alarm_pause
    use seq_timemgr_mod, only: seq_timemgr_pause_active
    use seq_timemgr_mod, only: seq_timemgr_pause_component_active
@@ -119,7 +109,6 @@ module cesm_comp_mod
    use seq_infodata_mod, only: seq_infodata_init, seq_infodata_exchange
    use seq_infodata_mod, only: seq_infodata_type, seq_infodata_orb_variable_year
    use seq_infodata_mod, only: seq_infodata_print, seq_infodata_init2
-   use seq_infodata_mod, only: infodata=>seq_infodata_infodata
 
    ! domain related routines
    use seq_domain_mct, only : seq_domain_check
@@ -239,23 +228,22 @@ module cesm_comp_mod
    ! Infodata: inter-model control flags, domain info
    !----------------------------------------------------------------------------
 
-! tcraig moved to seq_infodata_mod for NUOPC use temporarily
-!   type (seq_infodata_type), target :: infodata ! single instance for cpl and all comps
+   type (seq_infodata_type), target :: infodata ! single instance for cpl and all comps
 
    !----------------------------------------------------------------------------
    ! time management
    !----------------------------------------------------------------------------
 
-!   type (seq_timemgr_type), SAVE :: seq_SyncClock ! array of all clocks & alarm
-!   type (ESMF_Clock), target :: EClock_d      ! driver clock
-!   type (ESMF_Clock), target :: EClock_a      ! atmosphere clock
-!   type (ESMF_Clock), target :: EClock_l      ! land clock
-!   type (ESMF_Clock), target :: EClock_o      ! ocean clock
-!   type (ESMF_Clock), target :: EClock_i      ! ice clock
-!   type (ESMF_Clock), target :: EClock_g      ! glc clock
-!   type (ESMF_Clock), target :: EClock_r      ! rof clock
-!   type (ESMF_Clock), target :: EClock_w      ! wav clock
-!   type (ESMF_Clock), target :: EClock_e      ! esp clock
+   type (seq_timemgr_type), SAVE :: seq_SyncClock ! array of all clocks & alarm
+   type (ESMF_Clock), target :: EClock_d      ! driver clock
+   type (ESMF_Clock), target :: EClock_a      ! atmosphere clock
+   type (ESMF_Clock), target :: EClock_l      ! land clock
+   type (ESMF_Clock), target :: EClock_o      ! ocean clock
+   type (ESMF_Clock), target :: EClock_i      ! ice clock
+   type (ESMF_Clock), target :: EClock_g      ! glc clock
+   type (ESMF_Clock), target :: EClock_r      ! rof clock
+   type (ESMF_Clock), target :: EClock_w      ! wav clock
+   type (ESMF_Clock), target :: EClock_e      ! esp clock
 
    logical  :: restart_alarm          ! restart alarm
    logical  :: history_alarm          ! history alarm
@@ -606,16 +594,11 @@ subroutine cesm_pre_init1()
 
    integer, dimension(num_inst_total) :: comp_id, comp_comm, comp_comm_iam
    logical :: comp_iamin(num_inst_total)
-   logical :: flag
    character(len=seq_comm_namelen) :: comp_name(num_inst_total)
    integer :: i, it
 
-   call mpi_initialized(flag,ierr)
-   call shr_mpi_chkerr(ierr,subname//' mpi_initialized')
-   if (.not. flag) then
-     call mpi_init(ierr)
-     call shr_mpi_chkerr(ierr,subname//' mpi_init')
-   endif
+   call mpi_init(ierr)
+   call shr_mpi_chkerr(ierr,subname//' mpi_init')
 
    Global_Comm=MPI_COMM_WORLD
    comp_comm = MPI_COMM_NULL