fix compile errors

DeniseWorthen · Jul 4, 2020 · 3a1b88b · 3a1b88b
1 parent b4afd2e
commit 3a1b88b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
@@ -48,8 +48,8 @@ module ice_comp_nuopc
 #ifdef CESMCOUPLED
   use shr_const_mod
   use shr_orb_mod        , only : shr_orb_decl, shr_orb_params, SHR_ORB_UNDEF_REAL, SHR_ORB_UNDEF_INT
-  use ice_prescribed_mod , only : ice_prescribed_init
 #endif
+  use ice_prescribed_mod , only : ice_prescribed_init
 
   implicit none
   private
@@ -834,7 +834,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 
     call NUOPC_CompAttributeGet(gcomp, name='MCTID', value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    if (isPresent and isSet) then
+    if (isPresent .and. isSet) then
        read(cvalue,*) compid  ! convert from string to integer
     else
        compid = 0

diff --git a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
@@ -35,7 +35,7 @@ module ice_import_export
   use icepack_intfc      , only : icepack_warnings_flush, icepack_warnings_aborted
   use icepack_intfc      , only : icepack_query_parameters, icepack_query_tracer_flags
   use icepack_intfc      , only : icepack_liquidus_temperature
-  use ice_wrapper_mod    , only : t_startf, t_stopf, t_barrierf
+  use cice_wrapper_mod    , only : t_startf, t_stopf, t_barrierf
 #ifdef CESMCOUPLED
   use shr_frz_mod        , only : shr_frz_freezetemp
 #endif
@@ -171,7 +171,7 @@ subroutine ice_advertise_fields(gcomp, importState, exportState, flds_scalar_nam
     call fldlist_add(fldsToIce_num, fldsToIce, 'Sa_ptem'                       ) !cesm
     call fldlist_add(fldsToIce_num, fldsToIce, 'air_density_height_lowest'     ) !cesm
 
-    ! the folloing are advertised but might not be connected if they are not present
+    ! the following are advertised but might not be connected if they are not present
     ! in the cmeps esmFldsExchange_xxx_mod.F90 that is model specific
     ! from atm - black carbon deposition fluxes (3)
     call fldlist_add(fldsToIce_num, fldsToIce, 'Faxa_bcph',  ungridded_lbound=1, ungridded_ubound=3)
@@ -253,8 +253,8 @@ subroutine ice_advertise_fields(gcomp, importState, exportState, flds_scalar_nam
     if (flds_wiso) then
        call fldlist_add(fldsFrIce_num, fldsFrIce, 'mean_fresh_water_to_ocean_rate_wiso', &
             ungridded_lbound=1, ungridded_ubound=3)
-       call fldlist_add(fldsFrIce_num, fldsFrIce, 'mean_evap_rate_atm_into_ice_wiso', &
-            ungridded_lbound=1, ungridded_ubound=3)
+       !call fldlist_add(fldsFrIce_num, fldsFrIce, 'mean_evap_rate_atm_into_ice_wiso', &
+       !     ungridded_lbound=1, ungridded_ubound=3)
        call fldlist_add(fldsFrIce_num, fldsFrIce, 'Si_qref_wiso', &
             ungridded_lbound=1, ungridded_ubound=3)
     end if

diff --git a/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 b/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
@@ -7,6 +7,9 @@ module ice_prescribed_mod
   implicit none
   private ! except
 
+  ! MEMBER FUNCTIONS:
+  public  :: ice_prescribed_init      ! initialize input data stream
+
   logical(kind=log_kind), parameter, public :: prescribed_ice = .false.     ! true if prescribed ice
 
 #else
@@ -90,6 +93,7 @@ module ice_prescribed_mod
 !       ,  rcpidepressT = rcpi*depressT & ! param for finding T(z) from q (J/m^3)
 !       ,  rLfidepressT = rLfi*depressT   ! param for heat capacity       (J deg/m^3)
 !  ! heat capacity of sea ice, rhoi*C=rcpi+rLfidepressT*salinity/T^2
+#endif
 
 !=======================================================================
 contains
@@ -657,7 +661,6 @@ subroutine ice_prescribed_init(mpicom, compid, gindex)
     integer(kind=int_kind), intent(in) :: gindex(:)
     ! do nothing
   end subroutine ice_prescribed_init
-
 #endif
 
 end module ice_prescribed_mod