fixed problems in updated orbital calculations needed for cesm

DeniseWorthen · Apr 29, 2020 · 10e7c20 · 10e7c20
1 parent 183218a
commit 10e7c20
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 b/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
@@ -374,7 +374,7 @@ subroutine coupling_prep (iblk)
           fsens, flat, fswabs, flwout, evap, Tref, Qref, &
           scale_fluxes, frzmlt_init, frzmlt, Uref, wind
       use ice_flux_bgc, only: faero_ocn, fiso_ocn, Qref_iso, fiso_evap, &
-          fzsal_ai, fzsal_g_ai, flux_bio, flux_bio_ai
+          fzsal_ai, fzsal_g_ai, flux_bio, flux_bio_ai, &
           fnit, fsil, famm, fdmsp, fdms, fhum, fdust, falgalN, &
           fdoc, fdic, fdon, ffep, ffed, bgcflux_ice_to_ocn
       use ice_grid, only: tmask

diff --git a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
@@ -1039,7 +1039,6 @@ subroutine ice_export( exportState, rc )
             lmask=tmask, ifrac=ailohi, ungridded_index=2, rc=rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     endif
-#endif
 
     ! ------
     ! optional short wave penetration to ocean ice category
@@ -1056,11 +1055,12 @@ subroutine ice_export( exportState, rc )
           ! penetrative shortwave by category
           ! Note: no need zero out pass-through fields over land for benefit of x2oacc fields in cpl hist files since
           ! the export state has been zeroed out at the beginning
-          call state_setexport(exportState, 'mean_sw_pen_to_ocn_ifrac_n', input=aicen_init, index=n, &
+          call state_setexport(exportState, 'mean_sw_pen_to_ocn_ifrac_n', input=fswthrun_ai, index=n, &
                lmask=tmask, ifrac=ailohi, ungridded_index=n, rc=rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
        end do
     end if
+#endif
 
   end subroutine ice_export
 
@@ -1488,10 +1488,6 @@ subroutine state_setexport_4d_input(state, fldname, input, index, lmask, ifrac,
 
     if (geomtype == ESMF_GEOMTYPE_MESH) then
 
-       if (present(ungridded_index)) then
-          write(6,*)'DEBUG: fldname = ',trim(fldname),' has ungridded index= ',ungridded_index
-       end if
-
        ! get field pointer
        if (present(ungridded_index)) then
           call state_getfldptr(state, trim(fldname), dataPtr2d, rc)

diff --git a/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 b/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
@@ -49,7 +49,7 @@ module ice_prescribed_mod
   ! !PUBLIC DATA MEMBERS:
   logical(kind=log_kind), public :: prescribed_ice      ! true if prescribed ice
 
-  integer(SHR_KIND_IN),parameter :: nFilesMaximum = 400 ! max number of files
+  integer(kind=int_kind),parameter :: nFilesMaximum = 400 ! max number of files
   integer(kind=int_kind)         :: stream_year_first   ! first year in stream to use
   integer(kind=int_kind)         :: stream_year_last    ! last year in stream to use
   integer(kind=int_kind)         :: model_year_align    ! align stream_year_first