Changeset 12675 for NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90

Timestamp:

2020-04-03T18:00:43+02:00 (4 years ago)

Author:

dancopsey

Message:

Fix compile errors.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90

@@ -262 +262 @@
          &                  sn_rcv_icb   , sn_rcv_isf   , sn_rcv_wfreq , sn_rcv_tauw, nn_cats_cpl  ,   &
          &                  sn_rcv_ts_ice, sn_rcv_grnm  , sn_rcv_antm  ,                               &
-         &                  nn_coupled_iceshelf_fluxes  , ln_iceshelf_init_atmos                       &
+         &                  nn_coupled_iceshelf_fluxes  , ln_iceshelf_init_atmos ,                     &
          &                  rn_greenland_total_fw_flux  , rn_greenland_calving_fraction  ,             &
          &                  rn_antarctica_total_fw_flux , rn_antarctica_calving_fraction ,             &
@@ -1185 +1185 @@
       INTEGER  ::   ji, jj, jn             ! dummy loop indices
       INTEGER  ::   isec                   ! number of seconds since nit000 (assuming rdt did not change since nit000)
-      REAL(wp) ::   zcumulneg, zcumulpos   ! temporary scalars  
+      REAL(wp) ::   zcumulneg, zcumulpos   ! temporary scalars     
+      REAL(wp) ::   zcoef                  ! temporary scalar
+      LOGICAL  ::   ll_wrtstp              ! write diagnostics?
+      REAL(wp) ::   zrhoa  = 1.22          ! Air density kg/m3
+      REAL(wp) ::   zcdrag = 1.5e-3        ! drag coefficient
       REAL(wp) ::   zgreenland_icesheet_mass_in, zantarctica_icesheet_mass_in 
       REAL(wp) ::   zgreenland_icesheet_mass_b, zantarctica_icesheet_mass_b 
       REAL(wp) ::   zmask_sum, zepsilon    
-      REAL(wp) ::   zcoef                  ! temporary scalar
-      REAL(wp) ::   zrhoa  = 1.22          ! Air density kg/m3
-      REAL(wp) ::   zcdrag = 1.5e-3        ! drag coefficient
       REAL(wp) ::   zzx, zzy               ! temporary variables
       REAL(wp), DIMENSION(jpi,jpj) ::   ztx, zty, zmsk, zemp, zqns, zqsr
       !!----------------------------------------------------------------------
+      !
+      ll_wrtstp  = ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
       !
       IF( ln_mixcpl )   zmsk(:,:) = 1. - xcplmask(:,:,0)
@@ -1574 +1577 @@
             WRITE(numout,*) 'Greenland icesheet mass rate of change (kg/s) is ', greenland_icesheet_mass_rate_of_change
             WRITE(numout,*) 'Greenland icesheet seconds lapsed since last change is ', greenland_icesheet_timelapsed
-            IF(lflush) CALL flush(numout)
          ENDIF
       ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN
@@ -1612 +1614 @@
             WRITE(numout,*) 'Antarctica icesheet mass rate of change (kg/s) is ', antarctica_icesheet_mass_rate_of_change
             WRITE(numout,*) 'Antarctica icesheet seconds lapsed since last change is ', antarctica_icesheet_timelapsed
-            IF(lflush) CALL flush(numout)
          ENDIF
       ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN