remove cesmcoupled ifdefs

DeniseWorthen · Jul 2, 2020 · 6bccf71 · 6bccf71
1 parent 46fcfba
commit 6bccf71
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/cicecore/cicedynB/infrastructure/ice_read_write.F90 b/cicecore/cicedynB/infrastructure/ice_read_write.F90
@@ -1106,14 +1106,15 @@ subroutine ice_read_nc_xy(fid,  nrec,  varname, work,  diag, &
       integer (kind=int_kind) :: & 
          varid          , & ! variable id
          status             ! status output from netcdf routines
+!         status         , & ! status output from netcdf routines
 !        ndim, nvar,      & ! sizes of netcdf file
 !        id,              & ! dimension index
 !        dimlen             ! dimension size
 
       real (kind=dbl_kind) :: &
          amin, amax, asum   ! min, max values and sum of input array
 
-!     character (char_len) :: &
+!      character (char_len) :: &
 !        dimname            ! dimension name            
 
       real (kind=dbl_kind), dimension(:,:), allocatable :: &
@@ -1279,14 +1280,15 @@ subroutine ice_read_nc_xyz(fid,  nrec,  varname, work,  diag, &
          n,               & ! ncat index
          varid         , & ! variable id
          status            ! status output from netcdf routines
+!         status        , & ! status output from netcdf routines
 !        ndim, nvar,      & ! sizes of netcdf file
 !        id,              & ! dimension index
 !        dimlen             ! size of dimension
 
       real (kind=dbl_kind) :: &
          amin, amax, asum   ! min, max values and sum of input array
 
-!     character (char_len) :: &
+!      character (char_len) :: &
 !        dimname            ! dimension name            
 
       real (kind=dbl_kind), dimension(:,:,:), allocatable :: &
@@ -1364,7 +1366,7 @@ subroutine ice_read_nc_xyz(fid,  nrec,  varname, work,  diag, &
 
       if (my_task==master_task .and. diag) then
 !          write(nu_diag,*) & 
-!            'ice_read_nc_xyz, fid= ',fid, ', nrec = ',nrec, & 
+!           'ice_read_nc_xyz, fid= ',fid, ', nrec = ',nrec, &
 !            ', varname = ',trim(varname)
 !          status = nf90_inquire(fid, nDimensions=ndim, nVariables=nvar)
 !          write(nu_diag,*) 'ndim= ',ndim,', nvar= ',nvar
@@ -1835,6 +1837,7 @@ subroutine ice_write_nc_xy(fid,  nrec,  varid, work,  diag, &
 ! netCDF file diagnostics:
       integer (kind=int_kind) :: & 
          status             ! status output from netcdf routines
+!         status,         & ! status output from netcdf routines
 !        ndim, nvar,      & ! sizes of netcdf file
 !        id,              & ! dimension index
 !        dimlen             ! size of dimension
@@ -1844,7 +1847,8 @@ subroutine ice_write_nc_xy(fid,  nrec,  varid, work,  diag, &
 
       character (char_len) :: &
          lvarname           ! variable name
-!        dimname            ! dimension name            
+!         lvarname, &        ! variable name
+!         dimname            ! dimension name            
 
       real (kind=dbl_kind), dimension(:,:), allocatable :: &
          work_g1
@@ -1955,16 +1959,18 @@ subroutine ice_write_nc_xyz(fid,  nrec,  varid, work,  diag, &
       integer (kind=int_kind) :: & 
          n,               & ! ncat index
          status             ! status output from netcdf routines
-!        ndim, nvar,      & ! sizes of netcdf file
-!        id,              & ! dimension index
-!        dimlen             ! size of dimension
+!         status,          &  ! status output from netcdf routines
+!        ndim, nvar,       & ! sizes of netcdf file
+!        id,               & ! dimension index
+!        dimlen              ! size of dimension
 
       real (kind=dbl_kind) :: &
          amin, amax, asum   ! min, max values and sum of input array
 
       character (char_len) :: &
          lvarname           ! variable name
-!        dimname            ! dimension name            
+!         lvarname, &        ! variable name
+!         dimname            ! dimension name            
 
       real (kind=dbl_kind), dimension(:,:,:), allocatable :: &
          work_g1
@@ -2081,16 +2087,17 @@ subroutine ice_read_global_nc (fid,  nrec, varname, work_g, diag)
       integer (kind=int_kind) :: & 
          varid,           & ! netcdf id for field
          status             ! status output from netcdf routines
+!         status,         & ! status output from netcdf routines
 !        ndim, nvar,      & ! sizes of netcdf file
 !        id,              & ! dimension index
 !        dimlen             ! size of dimension      
 
       real (kind=dbl_kind) :: &
          amin, amax, asum   ! min, max values and sum of input array
 
-!    character (char_len) :: &
+!      character (char_len) :: &
 !        dimname            ! dimension name            
-!
+
 #ifdef ORCA_GRID
       real (kind=dbl_kind), dimension(:,:), allocatable :: &
          work_g3
@@ -2232,14 +2239,15 @@ subroutine ice_read_nc_uv(fid,  nrec, nzlev,  varname, work,  diag, &
       integer (kind=int_kind) :: & 
          varid          , & ! variable id
          status             ! status output from netcdf routines
+!         status,         & ! status output from netcdf routines
 !        ndim, nvar,      & ! sizes of netcdf file
 !        id,              & ! dimension index
 !        dimlen             ! size of dimension
 
       real (kind=dbl_kind) :: &
          amin, amax, asum   ! min, max values and sum of input array
 
-!     character (char_len) :: &
+!      character (char_len) :: &
 !        dimname            ! dimension name            
 
       real (kind=dbl_kind), dimension(:,:), allocatable :: &

diff --git a/cicecore/cicedynB/infrastructure/ice_restart_driver.F90 b/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
@@ -58,9 +58,7 @@ subroutine dumpfile(filename_spec)
           stressp_1, stressp_2, stressp_3, stressp_4, &
           stressm_1, stressm_2, stressm_3, stressm_4, &
           stress12_1, stress12_2, stress12_3, stress12_4
-#ifdef CESMCOUPLED
       use ice_flux, only: coszen
-#endif
       use ice_state, only: aicen, vicen, vsnon, trcrn, uvel, vvel
 
       character(len=char_len_long), intent(in), optional :: filename_spec
@@ -132,9 +130,7 @@ subroutine dumpfile(filename_spec)
       !-----------------------------------------------------------------
       ! radiation fields
       !-----------------------------------------------------------------
-#ifdef CESMCOUPLED
       call write_restart_field(nu_dump,0,coszen,'ruf8','coszen',1,diag)
-#endif
       call write_restart_field(nu_dump,0,scale_factor,'ruf8','scale_factor',1,diag)
 
       call write_restart_field(nu_dump,0,swvdr,'ruf8','swvdr',1,diag)
@@ -209,9 +205,7 @@ subroutine restartfile (ice_ic)
           stressp_1, stressp_2, stressp_3, stressp_4, &
           stressm_1, stressm_2, stressm_3, stressm_4, &
           stress12_1, stress12_2, stress12_3, stress12_4
-#ifdef CESMCOUPLED
       use ice_flux, only: coszen
-#endif
       use ice_grid, only: tmask, grid_type
       use ice_state, only: trcr_depend, aice, vice, vsno, trcr, &
           aice0, aicen, vicen, vsnon, trcrn, aice_init, uvel, vvel, &
@@ -310,11 +304,9 @@ subroutine restartfile (ice_ic)
       if (my_task == master_task) &
          write(nu_diag,*) 'radiation fields'
 
-#ifdef CESMCOUPLED
       call read_restart_field(nu_restart,0,coszen,'ruf8', &
 !           'coszen',1,diag, field_loc_center, field_type_scalar)
            'coszen',1,diag)
-#endif
       call read_restart_field(nu_restart,0,scale_factor,'ruf8', &
            'scale_factor',1,diag, field_loc_center, field_type_scalar)
       call read_restart_field(nu_restart,0,swvdr,'ruf8', &

diff --git a/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90 b/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
@@ -84,7 +84,6 @@ subroutine init_restart_read(ice_ic)
          endif
          endif ! use namelist values if use_restart_time = F
 
-         write(nu_diag,*) 'Restart read at istep=',istep0,time,time_forc
       endif
 
       call broadcast_scalar(istep0,master_task)
@@ -228,9 +227,7 @@ subroutine init_restart_write(filename_spec)
          call define_rest_field(ncid,'uvel',dims)
          call define_rest_field(ncid,'vvel',dims)
 
-#ifdef CESMCOUPLED
          call define_rest_field(ncid,'coszen',dims)
-#endif
          call define_rest_field(ncid,'scale_factor',dims)
          call define_rest_field(ncid,'swvdr',dims)
          call define_rest_field(ncid,'swvdf',dims)