Changeset 3517 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

Timestamp:

2012-10-26T12:13:21+02:00 (12 years ago)

Author:

gm

Message:

gm: Branch: dev_r3385_NOCS04_HAMF; #665. update sbccpl ; change LIM3 from equivalent salt flux to salt flux and mass flux

File:

• branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90 (modified) (8 diffs)

branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -182 +182 @@
       END DO
 
-      IF(  num_sal == 2  .OR.  num_sal == 4  )THEN
+      IF(  num_sal == 2  )THEN
          DO jl = 1, jpl
             DO jj = 1, jpj
@@ -309 +309 @@
       ! Vertically constant, constant in time
       !---------------------------------------
-      IF( num_sal == 1 )   s_i(:,:,:,:) = bulk_sal
+      IF(  num_sal == 1  )   s_i(:,:,:,:) = bulk_sal
 
       !-----------------------------------
       ! Salinity profile, varying in time
       !-----------------------------------
-
-      IF(   num_sal == 2  .OR.   num_sal == 4   ) THEN
+      IF(  num_sal == 2  ) THEN
          !
          DO jk = 1, nlay_i
@@ -331 +330 @@
          dummy_fac0 = 1._wp / ( s_i_0 - s_i_1 )       ! Weighting factor between zs_zero and zs_inf
          dummy_fac1 = s_i_1 / ( s_i_1 - s_i_0 )
-
+         !
          zalpha(:,:,:) = 0._wp
          DO jl = 1, jpl
@@ -347 +346 @@
             END DO
          END DO
-
+         !
          dummy_fac = 1._wp / nlay_i                   ! Computation of the profile
          DO jl = 1, jpl
@@ -361 +360 @@
             END DO ! jk
          END DO ! jl
-
+         !
       ENDIF ! num_sal
 
@@ -368 +367 @@
       !-------------------------------------------------------
 
-      IF( num_sal == 3 ) THEN      ! Schwarzacher (1959) multiyear salinity profile (mean = 2.30)
+      IF(  num_sal == 3  ) THEN      ! Schwarzacher (1959) multiyear salinity profile (mean = 2.30)
          !
          sm_i(:,:,:) = 2.30_wp
@@ -380 +379 @@
             END DO
          END DO
-
+         !
       ENDIF ! num_sal
       !
@@ -447 +446 @@
       !------------------------------------------------------
 
-      IF(  num_sal == 2  .OR.  num_sal == 4  ) THEN
+      IF(  num_sal == 2  ) THEN
          !
          DO ji = kideb, kiut          ! Slope of the linear profile zs_zero