Update to CICE master

cicecore/cicedynB/general/ice_flux.F90

@@ -472,7 +472,7 @@ subroutine init_coupler_flux
       fsens   (:,:,:) = c0
       flat    (:,:,:) = c0
       fswabs  (:,:,:) = c0
-      fswint_ai(:,:,:) = c0
+!     fswint_ai(:,:,:) = c0
       flwout  (:,:,:) = -stefan_boltzmann*Tffresh**4   
                         ! in case atm model diagnoses Tsfc from flwout
       evap    (:,:,:) = c0
@@ -492,7 +492,7 @@ subroutine init_coupler_flux
       strocnyT(:,:,:) = c0    ! ice-ocean stress, y-direction (T-cell)
       fresh   (:,:,:) = c0
       fsalt   (:,:,:) = c0
-      fpond   (:,:,:) = c0
+!     fpiond   (:,:,:) = c0
       fhocn   (:,:,:) = c0
       fswthru (:,:,:) = c0
       fresh_da(:,:,:) = c0    ! data assimilation
@@ -518,7 +518,7 @@ subroutine init_coupler_flux
 
       coszen  (:,:,:) = c0            ! Cosine of the zenith angle
       fsw     (:,:,:) = c0            ! shortwave radiation (W/m^2)
-      fswfac  (:,:,:) = c0
+!     fswfac  (:,:,:) = c0
       scale_factor(:,:,:) = c1        ! shortwave scaling factor 
       wind    (:,:,:) = sqrt(uatm(:,:,:)**2 &
                            + vatm(:,:,:)**2)  ! wind speed, (m/s)
@@ -581,6 +581,7 @@ subroutine init_flux_ocn
 
       fresh    (:,:,:)   = c0
       fsalt    (:,:,:)   = c0
+!     fpond    (:,:,:)   = c0
       fhocn    (:,:,:)   = c0
       fswthru  (:,:,:)   = c0
       faero_ocn(:,:,:,:) = c0
@@ -630,7 +631,7 @@ subroutine init_history_therm
       fsurf  (:,:,:) = c0
       fcondtop(:,:,:)= c0
       congel (:,:,:) = c0
-      fbot   (:,:,:) = c0
+!     fbot   (:,:,:) = c0
       frazil (:,:,:) = c0
       snoice (:,:,:) = c0
       dsnow  (:,:,:) = c0
@@ -665,7 +666,7 @@ subroutine init_history_therm
       Cdn_ocn(:,:,:) = dragio
       Cdn_atm(:,:,:) = (vonkar/log(zref/iceruf)) &
                      * (vonkar/log(zref/iceruf)) ! atmo drag for RASM
-      Cdn_atm_ratio(:,:,:)= c0
+!     Cdn_atm_ratio(:,:,:)= c0
 
       if (formdrag) then
         Cdn_atm_rdg (:,:,:) = c0
@@ -716,7 +717,7 @@ subroutine init_history_dyn
       sig2    (:,:,:) = c0
       taubx   (:,:,:) = c0
       tauby   (:,:,:) = c0
-      strength (:,:,:) = c0
+!     strength (:,:,:) = c0
       strocnx (:,:,:) = c0
       strocny (:,:,:) = c0
       strairx (:,:,:) = c0

cicecore/cicedynB/general/ice_forcing.F90

@@ -164,20 +164,20 @@ subroutine init_forcing_atmo
 
       character(len=*), parameter :: subname = '(init_forcing_atmo)'
 
-      fsw_data(:,:,:,:) = c0
-      cldf_data(:,:,:,:) = c0
-      fsnow_data(:,:,:,:) = c0
-      Tair_data(:,:,:,:) = c0
-      uatm_data(:,:,:,:) = c0
-      vatm_data(:,:,:,:) = c0
-      wind_data(:,:,:,:) = c0
-      strax_data(:,:,:,:) = c0
-      stray_data(:,:,:,:) = c0
-      Qa_data(:,:,:,:) = c0
-      rhoa_data(:,:,:,:) = c0
-      flw_data(:,:,:,:) = c0
-      sublim_data(:,:,:,:) = c0
-      frain_data(:,:,:,:) = c0
+!     fsw_data(:,:,:,:) = c0
+!     cldf_data(:,:,:,:) = c0
+!     fsnow_data(:,:,:,:) = c0
+!     Tair_data(:,:,:,:) = c0
+!     uatm_data(:,:,:,:) = c0
+!     vatm_data(:,:,:,:) = c0
+!     wind_data(:,:,:,:) = c0
+!     strax_data(:,:,:,:) = c0
+!     stray_data(:,:,:,:) = c0
+!     Qa_data(:,:,:,:) = c0
+!     rhoa_data(:,:,:,:) = c0
+!     flw_data(:,:,:,:) = c0
+!     sublim_data(:,:,:,:) = c0
+!     frain_data(:,:,:,:) = c0
 
       fyear       = fyear_init + mod(nyr-1,ycycle) ! current year
       fyear_final = fyear_init + ycycle - 1 ! last year in forcing cycle
@@ -268,10 +268,10 @@ subroutine init_forcing_ocn(dt)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
 
-      sst_data(:,:,:,:) = c0
-      sss_data(:,:,:,:) = c0
-      uocn_data(:,:,:,:) = c0
-      vocn_data(:,:,:,:) = c0
+!     sst_data(:,:,:,:) = c0
+!     sss_data(:,:,:,:) = c0
+!     uocn_data(:,:,:,:) = c0
+!     vocn_data(:,:,:,:) = c0
 
       nbits = 64              ! double precision data
 
@@ -1338,9 +1338,9 @@ subroutine prepare_forcing (nx_block, ny_block, &
          rhoa (i,j) = max(rhoa(i,j),c0)
          Qa   (i,j) = max(Qa(i,j),c0)
 
-         if (rhoa(i,j) .lt. puny) rhoa(i,j) = 1.3_dbl_kind            
-         if (Tair(i,j) .lt. puny) Tair(i,j) = Tffresh
-         if (Qa(i,j) .lt. puny) Qa(i,j) = 0.0035_dbl_kind
+!        if (rhoa(i,j) .lt. puny) rhoa(i,j) = 1.3_dbl_kind            
+!        if (Tair(i,j) .lt. puny) Tair(i,j) = Tffresh
+!        if (Qa(i,j) .lt. puny) Qa(i,j) = 0.0035_dbl_kind
       enddo                     ! i
       enddo                     ! j
 

cicecore/cicedynB/general/ice_step_mod.F90

@@ -77,10 +77,10 @@ subroutine prep_radiation (iblk)
 
       call ice_timer_start(timer_sw)      ! shortwave
 
-      alvdr_init(:,:,:) = c0
-      alvdf_init(:,:,:) = c0
-      alidr_init(:,:,:) = c0
-      alidf_init(:,:,:) = c0
+!     alvdr_init(:,:,:) = c0
+!     alvdf_init(:,:,:) = c0
+!     alidr_init(:,:,:) = c0
+!     alidf_init(:,:,:) = c0
 
          this_block = get_block(blocks_ice(iblk),iblk)         
          ilo = this_block%ilo
@@ -984,14 +984,17 @@ subroutine ocean_mixed_layer (dt, iblk)
          indxi(:) = 0
          indxj(:) = 0
 
-         this_block = get_block(blocks_ice(iblk),iblk)         
-         ilo = this_block%ilo
-         ihi = this_block%ihi
-         jlo = this_block%jlo
-         jhi = this_block%jhi
+!        this_block = get_block(blocks_ice(iblk),iblk)         
+!        ilo = this_block%ilo
+!        ihi = this_block%ihi
+!        jlo = this_block%jlo
+!        jhi = this_block%jhi
+
+!        do j = jlo, jhi
+!        do i = ilo, ihi
+         do j = 1, ny_block
+         do i = 1, nx_block
 
-         do j = jlo, jhi
-         do i = ilo, ihi
             if (tmask(i,j,iblk)) then
                icells = icells + 1
                indxi(icells) = i

cicecore/cicedynB/infrastructure/ice_grid.F90

@@ -306,7 +306,7 @@ subroutine init_grid2
       ! T-grid cell and U-grid cell quantities
       !-----------------------------------------------------------------
 
-      tarea(:,:,:) = c0
+!     tarea(:,:,:) = c0
 
       !$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
       do iblk = 1, nblocks
@@ -1509,7 +1509,7 @@ subroutine makemask
       !-----------------------------------------------------------------
 
       bm = c0
-      uvm = c0
+!     uvm = c0
 
       !$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
       do iblk = 1, nblocks
@@ -1945,8 +1945,8 @@ subroutine gridbox_corners
       ! (1) SW corner, (2) SE corner, (3) NE corner, (4) NW corner
       !-------------------------------------------------------------
 
-      latu_bounds(:,:,:,:) = c0
-      lonu_bounds(:,:,:,:) = c0
+!     latu_bounds(:,:,:,:) = c0
+!     lonu_bounds(:,:,:,:) = c0
 
       !$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block)
       do iblk = 1, nblocks
@@ -1985,7 +1985,7 @@ subroutine gridbox_corners
       endif
 
       work1(:,:,:) = latu_bounds(2,:,:,:)
-      work_g2 = c0
+!     work_g2 = c0
 
       call gather_global(work_g2, work1, master_task, distrb_info)
       if (my_task == master_task) then

cicecore/drivers/cice/CICE_RunMod.F90

@@ -420,15 +420,17 @@ subroutine coupling_prep (iblk)
          enddo
          enddo
 
-         this_block = get_block(blocks_ice(iblk),iblk)
-         ilo = this_block%ilo
-         ihi = this_block%ihi
-         jlo = this_block%jlo
-         jhi = this_block%jhi
+!        this_block = get_block(blocks_ice(iblk),iblk)
+!        ilo = this_block%ilo
+!        ihi = this_block%ihi
+!        jlo = this_block%jlo
+!        jhi = this_block%jhi
 
          do n = 1, ncat
-         do j = jlo, jhi
-         do i = ilo, ihi
+!        do j = jlo, jhi
+!        do i = ilo, ihi
+         do j = 1, ny_block
+         do i = 1, nx_block
             if (aicen(i,j,n,iblk) > puny) then
 
             alvdf(i,j,iblk) = alvdf(i,j,iblk) &

cicecore/shared/ice_fileunits.F90

@@ -278,7 +278,11 @@ subroutine flush_fileunit(iunit)
 #ifdef CESMCOUPLED
          call shr_sys_flush(iunit)
 #else
+#ifndef NO_F2003
          flush(iunit)
+#else
+! Place holder for old call.
+#endif
 #endif
 
       end subroutine flush_fileunit

configuration/scripts/machines/Macros.conrad_pgi

@@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -Mbounds -Mchkptr
 else
-  FFLAGS     += -O2
+  FFLAGS     += -O -g
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)

configuration/scripts/machines/Macros.gordon_pgi

@@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -Mbounds -Mchkptr
 else
-  FFLAGS     += -O2
+  FFLAGS     += -O -g
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)

configuration/scripts/machines/Macros.hobart_intel

@@ -29,9 +29,7 @@ MPICC:= mpicc
 MPIFC:= mpif90
 LD:= $(MPIFC)
 
-NETCDF_PATH := /usr/local/netcdf-intel-cluster
-
-INCLDIR := -I/usr/local/netcdf-intel-cluster/include -I/usr/mpi/intel/mvapich2-2.1-qlc/include
+INCLDIR := -I$(NETCDF_PATH)/include -I$(MPI_PATH)/include
 
 LIB_NETCDF := $(NETCDF_PATH)/lib
 LIB_PNETCDF := $(PNETCDF_PATH)/lib

configuration/scripts/machines/Macros.hobart_nag

@@ -29,9 +29,7 @@ MPICC:= mpicc
 MPIFC:= mpif90
 LD:= $(MPIFC)
 
-NETCDF_PATH := /usr/local/netcdf_c-4.3.2_f-4.4.1-nag-6.0
-
-INCLDIR := -I/usr/local/netcdf_c-4.3.2_f-4.4.1-nag-6.0/include -I/cluster/mvapich2-2.2rc1-gcc-g++-4.8.5-nag-6.1/include
+INCLDIR := -I$(NETCDF_PATH)/include -I$(MPI_PATH)/include
 
 LIB_NETCDF := $(NETCDF_PATH)/lib
 LIB_PNETCDF := $(PNETCDF_PATH)/lib

configuration/scripts/machines/env.hobart_intel

@@ -3,7 +3,7 @@
 source /usr/share/Modules/init/csh
 
 module purge
-module load compiler/intel/17.0.4.196
+module load compiler/intel/18.0.3
 
 setenv ICE_MACHINE_ENVNAME hobart
 setenv ICE_MACHINE_COMPILER ifort

configuration/scripts/machines/env.hobart_nag

@@ -3,7 +3,7 @@
 source /usr/share/Modules/init/csh
 
 module purge
-module load compiler/nag/6.1
+module load compiler/nag/6.2
 
 setenv ICE_MACHINE_ENVNAME hobart
 setenv ICE_MACHINE_COMPILER nag