Changeset 4205 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

Timestamp:

2013-11-14T18:02:06+01:00 (10 years ago)

Author:

clem

Message:

 

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) (5 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    USE ice            ! sea-ice variables
+   USE oce     , ONLY :  snwice_mass, snwice_mass_b
    USE par_ice        ! sea-ice parameters
    USE dom_oce        ! ocean domain
@@ -159 +160 @@
       END DO
 
-      CALL iom_rstput( iter, nitrst, numriw, 'u_ice'     , u_ice      )
-      CALL iom_rstput( iter, nitrst, numriw, 'v_ice'     , v_ice      )
-      CALL iom_rstput( iter, nitrst, numriw, 'fsbbq'     , fsbbq      )
-      CALL iom_rstput( iter, nitrst, numriw, 'iatte'     , iatte      ) ! clem modif
-      CALL iom_rstput( iter, nitrst, numriw, 'oatte'     , oatte      ) ! clem modif
-      CALL iom_rstput( iter, nitrst, numriw, 'stress1_i' , stress1_i  )
-      CALL iom_rstput( iter, nitrst, numriw, 'stress2_i' , stress2_i  )
-      CALL iom_rstput( iter, nitrst, numriw, 'stress12_i', stress12_i )
+      CALL iom_rstput( iter, nitrst, numriw, 'u_ice'        , u_ice      )
+      CALL iom_rstput( iter, nitrst, numriw, 'v_ice'        , v_ice      )
+      CALL iom_rstput( iter, nitrst, numriw, 'fsbbq'        , fsbbq      )
+      CALL iom_rstput( iter, nitrst, numriw, 'stress1_i'    , stress1_i  )
+      CALL iom_rstput( iter, nitrst, numriw, 'stress2_i'    , stress2_i  )
+      CALL iom_rstput( iter, nitrst, numriw, 'stress12_i'   , stress12_i )
+      CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass'  , snwice_mass )   !clem modif
+      CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass_b', snwice_mass_b ) !clem modif
 
       DO jl = 1, jpl 
@@ -371 +372 @@
          CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
          t_su(:,:,jl) = z2d(:,:)
-         tn_ice (:,:,:) = t_su (:,:,:)
-      END DO
-
-      DO jl = 1, jpl 
-         CALL lbc_lnk( smv_i(:,:,jl) , 'T' ,  1. )
-         CALL lbc_lnk( v_i  (:,:,jl) , 'T' ,  1. )
-         CALL lbc_lnk( a_i  (:,:,jl) , 'T' ,  1. )
-      END DO
-
-      ! we first with bulk ice salinity
-      DO jl = 1, jpl
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zindb          = MAX( 0.0 , SIGN( 1.0 , v_i(ji,jj,jl) - 1.0e-4 ) ) 
-               sm_i(ji,jj,jl) = smv_i(ji,jj,jl) / MAX(v_i(ji,jj,jl),1.0e-6) * zindb
-               ht_i(ji,jj,jl) = v_i(ji,jj,jl)   / MAX(a_i(ji,jj,jl),1.0e-6) * zindb
-            END DO
-         END DO
-      END DO
-
-      DO jk = 1, nlay_i
-         s_i(:,:,jk,:) = sm_i(:,:,:)
-      END DO
-
-      IF( num_sal == 2 ) THEN      ! Salinity profile
-         DO jl = 1, jpl
-            DO jk = 1, nlay_i
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     zs_inf        = sm_i(ji,jj,jl)
-                     z_slope_s     = 2._wp * sm_i(ji,jj,jl) / MAX( 0.01_wp , ht_i(ji,jj,jl) )
-                     !- slope of the salinity profile
-                     zs_zero(jk)   = z_slope_s * ( REAL(jk,wp) - 0.5_wp ) * ht_i(ji,jj,jl) / REAL(nlay_i,wp)
-                     zsmax = 4.5_wp
-                     zsmin = 3.5_wp
-                     IF(     sm_i(ji,jj,jl) < zsmin ) THEN
-                        zalpha = 1._wp
-                     ELSEIF( sm_i(ji,jj,jl) < zsmax ) THEN
-                        zalpha = sm_i(ji,jj,jl) / ( zsmin - zsmax ) + zsmax / ( zsmax - zsmin )
-                     ELSE
-                        zalpha = 0._wp
-                     ENDIF
-                     s_i(ji,jj,jk,jl) = zalpha * zs_zero(jk) + ( 1._wp - zalpha ) * zs_inf
-                  END DO
-               END DO
-            END DO
-         END DO
-      ENDIF
+      END DO
 
       DO jl = 1, jpl 
@@ -440 +394 @@
       CALL iom_get( numrir, jpdom_autoglo, 'v_ice'     , v_ice      )
       CALL iom_get( numrir, jpdom_autoglo, 'fsbbq'     , fsbbq      )
-      CALL iom_get( numrir, jpdom_autoglo, 'iatte'     , iatte      ) ! clem modif
-      CALL iom_get( numrir, jpdom_autoglo, 'oatte'     , oatte      ) ! clem modif
       CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i  )
       CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i  )
       CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i )
+      CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass'  , snwice_mass )   !clem modif
+      CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b ) !clem modif
 
       DO jl = 1, jpl 
@@ -568 +522 @@
       END DO
       !
-      !clem CALL iom_close( numrir )
+      !CALL iom_close( numrir ) !clem: closed in sbcice_lim.F90
       !
       CALL wrk_dealloc( nlay_i, zs_zero )