Changeset 5075 for branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

Timestamp:

2015-02-11T11:50:34+01:00 (9 years ago)

Author:

timgraham

Message:

Upgraded branch to current head of trunk (r5072) so it can be used with the trunk

File:

• branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) (5 diffs)

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

@@ -142 +142 @@
          CALL iom_rstput( iter, nitrst, numriw, znam , z2d )
       END DO
-
+      
       DO jl = 1, jpl 
          WRITE(zchar,'(I1)') jl
@@ -162 +162 @@
       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  )
@@ -309 +308 @@
       INTEGER :: ji, jj, jk, jl, indx
       REAL(wp) ::   zfice, ziter
-      REAL(wp) ::   zs_inf, z_slope_s, zsmax, zsmin, zalpha, zindb   ! local scalars used for the salinity profile
-      REAL(wp), POINTER, DIMENSION(:)  ::   zs_zero 
+      REAL(wp) ::   zs_inf, z_slope_s, zsmax, zsmin, zalpha   ! local scalars used for the salinity profile
+      REAL(wp), POINTER, DIMENSION(:)   ::   zs_zero 
       REAL(wp), POINTER, DIMENSION(:,:) ::   z2d
       CHARACTER(len=15) ::   znam
@@ -393 +392 @@
       CALL iom_get( numrir, jpdom_autoglo, 'u_ice'     , u_ice      )
       CALL iom_get( numrir, jpdom_autoglo, 'v_ice'     , v_ice      )
-      CALL iom_get( numrir, jpdom_autoglo, 'fsbbq'     , fsbbq      )
       CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i  )
       CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i  )
@@ -522 +520 @@
       END DO
       !
+      ! clem: I do not understand why the following IF is needed
+      !       I suspect something inconsistent in the main code with option num_sal=1
+      IF( num_sal == 1 ) THEN
+         DO jl = 1, jpl 
+            sm_i(:,:,jl) = bulk_sal
+            DO jk = 1, nlay_i 
+               s_i(:,:,jk,jl) = bulk_sal
+            END DO
+         END DO
+      ENDIF
+      !
       !CALL iom_close( numrir ) !clem: closed in sbcice_lim.F90
       !