Changeset 7278 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

Timestamp:

2016-11-21T10:38:43+01:00 (8 years ago)

Author:

flavoni

Message:

update branch CNRS-2016 to trunk 6720

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (6 diffs)

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

@@ -24 +24 @@
    USE par_oce          ! ocean parameters
    USE dom_ice          ! sea-ice domain
+   USE limvar           ! lim_var_salprof
    USE in_out_manager   ! I/O manager
    USE lib_mpp          ! MPP library
@@ -277 +278 @@
                            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) 
                           ztest_1 = 0
                         ENDIF
@@ -289 +288 @@
                            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)
                            ztest_2 = 0
                         ENDIF
@@ -299 +295 @@
                            ztest_3 = 1
                         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,*) ' ji,jj,i_fill ',ji,jj,i_fill
-                           IF(lwp) WRITE(numout,*) 'zht_i_ini ',zht_i_ini(ji,jj)
                            ztest_3 = 0
                         ENDIF
@@ -311 +302 @@
                         DO jl = 1, jpl
                            IF ( za_i_ini(ji,jj,jl) .LT. 0._wp ) THEN 
-                              ! this write is useful
-                              IF(lwp) WRITE(numout,*) ' * TEST 4 POSITIVITY NOT OK FOR CAT ', jl, ' WITH A = ', za_i_ini(ji,jj,jl)
                               ztest_4 = 0
                            ENDIF
@@ -379 +368 @@
          END DO
 
+         ! for constant salinity in time
+         IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN
+            CALL lim_var_salprof
+            smv_i = sm_i * v_i
+         ENDIF
+         
          ! Snow temperature and heat content
          DO jk = 1, nlay_s