Changeset 6994 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2016-10-05T15:07:10+02:00 (8 years ago)

Author:

clem

Message:

clean online sea ice diagnostics

File:

• branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (7 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -195 +195 @@
 #if defined key_bdy
          IF( ln_limthd )              CALL bdy_ice_lim( kt )   ! -- bdy ice thermo 
-         IF( ln_icectl )              CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - ice thermo bdy - ' )
 #endif
 
@@ -260 +259 @@
                                       CALL lim_sbc_flx( kt )    ! -- Update surface ocean mass, heat and salt fluxes
                                       !
-         IF(ln_limdiaout)             CALL lim_diahsb( kt )     ! -- Diagnostics and outputs 
+         IF( ln_limdiahsb )           CALL lim_diahsb( kt )     ! -- Diagnostics and outputs 
          !
                                       CALL lim_wri( 1 )         ! -- Ice outputs 
@@ -269 +268 @@
          IF( lrst_ice )               CALL lim_rst_write( kt )  ! -- Ice restart file 
          !
-         IF( ln_icectl )              CALL lim_ctl( kt )        ! alerts in case of model crash
+         IF( ln_limctl )              CALL lim_ctl( kt )        ! alerts in case of model crash
          !
       ENDIF   ! End sea-ice time step only
@@ -346 +345 @@
       CALL lim_sbc_init                 ! ice surface boundary condition   
       !
-      IF( ln_limdiaout) CALL lim_diahsb_init  ! initialization for diags
+      IF( ln_limdiahsb) CALL lim_diahsb_init  ! initialization for diags
       !
       fr_i(:,:)     = at_i(:,:)         ! initialisation of sea-ice fraction
@@ -386 +385 @@
       NAMELIST/namicerun/ jpl, nlay_i, nlay_s, rn_amax_n, rn_amax_s, cn_icerst_in, cn_icerst_indir,   &
          &                cn_icerst_out, cn_icerst_outdir, ln_limthd, ln_limdyn, nn_limdyn, rn_uice, rn_vice  
-      NAMELIST/namicediag/ ln_limdiahsb, ln_limdiaout, ln_icectl, iiceprt, jiceprt  
+      NAMELIST/namicediag/ ln_limdiachk, ln_limdiahsb, ln_limctl, iiceprt, jiceprt  
       !!-------------------------------------------------------------------
       !                    
@@ -427 +426 @@
          WRITE(numout,*) '...and ice diagnostics'
          WRITE(numout,*) ' ~~~~~~~~~~~~~~~~~~~~'
-         WRITE(numout,*) '   Diagnose heat/mass/salt budget or not     ln_limdiahsb  = ', ln_limdiahsb
-         WRITE(numout,*) '   Output   heat/mass/salt budget or not     ln_limdiaout  = ', ln_limdiaout
-         WRITE(numout,*) '   control prints in ocean.out for (i,j)=(iiceprt,jiceprt) = ', ln_icectl
-         WRITE(numout,*) '   i-index for control prints (ln_icectl=true)             = ', iiceprt
-         WRITE(numout,*) '   j-index for control prints (ln_icectl=true)             = ', jiceprt
+         WRITE(numout,*) '   Diagnose online heat/mass/salt budget     ln_limdiachk  = ', ln_limdiachk
+         WRITE(numout,*) '   Output          heat/mass/salt budget     ln_limdiahsb  = ', ln_limdiahsb
+         WRITE(numout,*) '   control prints in ocean.out for (i,j)=(iiceprt,jiceprt) = ', ln_limctl
+         WRITE(numout,*) '   i-index for control prints (ln_limctl=true)             = ', iiceprt
+         WRITE(numout,*) '   j-index for control prints (ln_limctl=true)             = ', jiceprt
       ENDIF
       !
@@ -443 +442 @@
       !
 #if defined key_bdy
-      IF( lwp .AND. ln_limdiahsb )  CALL ctl_warn('online conservation check activated but it does not work with BDY')
+      IF( lwp .AND. ln_limdiachk )  CALL ctl_warn('online conservation check activated but it does not work with BDY')
 #endif
       !