Changeset 6347 for branches/2016/dev_r6325_SIMPLIF_1/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

Timestamp:

2016-02-24T08:56:48+01:00 (8 years ago)

Author:

gm

Message:

#1683: SIMPLIF-1 : Phase with the v3.6_Stable (DOC+ZDF+traqsr+lbedo)

File:

• branches/2016/dev_r6325_SIMPLIF_1/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (4 diffs)

branches/2016/dev_r6325_SIMPLIF_1/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -273 +273 @@
                         !---------------------
                         ! Test 1: area conservation
-                        zA_cons = SUM(za_i_ini(ji,jj,:)) ; zconv = ABS(zat_i_ini(ji,jj) - zA_cons )
-                        IF ( zconv .LT. 1.0e-6 ) THEN
+                        zA_cons = SUM( za_i_ini(ji,jj,:) )
+                        zconv   = ABS( zat_i_ini(ji,jj) - zA_cons )
+                        IF ( zconv < 1.0e-6 ) THEN
                            ztest_1 = 1
                         ELSE 
-                          !this write is useful
-                          IF(lwp)  WRITE(numout,*) ' * TEST1 AREA NOT CONSERVED *** zA_cons = ', zA_cons,' zat_i_ini = ',zat_i_ini(ji,jj) 
+                          ! this write is useful
+                          IF(lwp)  WRITE(numout,*) ' * TEST1 AREA NOT CONSERVED *** zA_cons = ', zA_cons,   &
+                           &                                                    ' zat_i_ini = ',zat_i_ini(ji,jj)
                           ztest_1 = 0
                         ENDIF
 
                         ! Test 2: volume conservation
-                        zV_cons = SUM(zv_i_ini(ji,jj,:))
-                        zconv = ABS(zvt_i_ini(ji,jj) - zV_cons)
-
-                        IF( zconv .LT. 1.0e-6 ) THEN
+                        zV_cons = SUM( zv_i_ini(ji,jj,:) )
+                        zconv   = ABS( zvt_i_ini(ji,jj) - zV_cons )
+
+                        IF( zconv < 1.0e-6 ) THEN
                            ztest_2 = 1
                         ELSE
-                           !this write is useful
-                           IF(lwp)  WRITE(numout,*) ' * TEST2 VOLUME NOT CONSERVED *** zV_cons = ', zV_cons, &
-                                                    ' zvt_i_ini = ', zvt_i_ini(ji,jj)
+                           ! this write is useful
+                           IF(lwp)  WRITE(numout,*) ' * TEST2 VOLUME NOT CONSERVED *** zV_cons = ', zV_cons,   &
+                              &                                                    ' zvt_i_ini = ', zvt_i_ini(ji,jj)
                            ztest_2 = 0
                         ENDIF
@@ -300 +302 @@
                         ELSE
                            ! this write is useful
-                           IF(lwp) WRITE(numout,*) ' * TEST 3 THICKNESS OF THE LAST CATEGORY OUT OF BOUNDS *** zh_i_ini(ji,jj,i_fill) = ', &
-                           zh_i_ini(ji,jj,i_fill), ' hi_max(jpl-1) = ', hi_max(i_fill-1)
+                           IF(lwp) WRITE(numout,*) ' * TEST3 THICKNESS OF THE LAST CATEGORY OUT OF BOUNDS *** ',   &
+                              &    ' zh_i_ini(ji,jj,i_fill) = ', zh_i_ini(ji,jj,i_fill), ' hi_max(jpl-1) = ', hi_max(i_fill-1)
                            IF(lwp) WRITE(numout,*) ' ji,jj,i_fill ',ji,jj,i_fill
                            IF(lwp) WRITE(numout,*) 'zht_i_ini ',zht_i_ini(ji,jj)
@@ -529 +531 @@
       !!-----------------------------------------------------------------------------
       !
-      REWIND( numnam_ice_ref )              ! Namelist namiceini in reference namelist : Ice initial state
+      REWIND( numnam_ice_ref )         ! Namelist namiceini in reference namelist : Ice initial state
       READ  ( numnam_ice_ref, namiceini, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in reference namelist', lwp )
 
-      REWIND( numnam_ice_cfg )              ! Namelist namiceini in configuration namelist : Ice initial state
+      REWIND( numnam_ice_cfg )         ! Namelist namiceini in configuration namelist : Ice initial state
       READ  ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp )
       IF(lwm) WRITE ( numoni, namiceini )
 
-      slf_i(jp_hti) = sn_hti  ;  slf_i(jp_hts) = sn_hts
-      slf_i(jp_ati) = sn_ati  ;  slf_i(jp_tsu) = sn_tsu
-      slf_i(jp_tmi) = sn_tmi  ;  slf_i(jp_smi) = sn_smi
-
-      ! Define the initial parameters
-      ! -------------------------
-
-      IF(lwp) THEN
+      slf_i(jp_hti) = sn_hti   ;   slf_i(jp_hts) = sn_hts
+      slf_i(jp_ati) = sn_ati   ;   slf_i(jp_tsu) = sn_tsu
+      slf_i(jp_tmi) = sn_tmi   ;   slf_i(jp_smi) = sn_smi
+
+      IF(lwp) THEN                     ! control print
          WRITE(numout,*)
          WRITE(numout,*) 'lim_istate_init : ice parameters inititialisation '
@@ -571 +570 @@
             CALL ctl_stop( 'Ice_ini in limistate: unable to allocate si structure' )   ;   RETURN
          ENDIF
-
+         !
          DO ifpr = 1, jpfldi
             ALLOCATE( si(ifpr)%fnow(jpi,jpj,1) )
             ALLOCATE( si(ifpr)%fdta(jpi,jpj,1,2) )
          END DO
-
+         !
          ! fill si with slf_i and control print
          CALL fld_fill( si, slf_i, cn_dir, 'lim_istate', 'lim istate ini', 'numnam_ice' )
-
+         !
          CALL fld_read( nit000, 1, si )                ! input fields provided at the current time-step
-
+         !
       ENDIF
-
+      !
    END SUBROUTINE lim_istate_init