Changeset 2777 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90

Timestamp:

2011-06-07T11:55:02+02:00 (13 years ago)

Author:

smasson

Message:

LIM3 compiling and (partly?) running in v3_3_1, see ticket#817

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_dif.F90

@@ -330 +330 @@
          IF( thcon_i_swi == 0 ) THEN      ! Untersteiner (1964) formula
             DO ji = kideb , kiut
-               ztcond_i(ji,0)        = rcdic + zbeta*s_i_b(ji,1) / &
-                  MIN(-zeps,t_i_b(ji,1)-rtt)
+               ztcond_i(ji,0)        = rcdic + zbeta*s_i_b(ji,1) / MIN(-zeps,t_i_b(ji,1)-rtt)
                ztcond_i(ji,0)        = MAX(ztcond_i(ji,0),zkimin)
             END DO
             DO layer = 1, nlay_i-1
                DO ji = kideb , kiut
-                  ztcond_i(ji,layer) = rcdic + zbeta*( s_i_b(ji,layer) &
-                     + s_i_b(ji,layer+1) ) / MIN(-2.0*zeps,     &
-                     t_i_b(ji,layer)+t_i_b(ji,layer+1)-2.0*rtt)
-                  ztcond_i(ji,layer)   = MAX(ztcond_i(ji,layer),zkimin)
-               END DO
-            END DO
-         ENDIF
-
-         IF ( thcon_i_swi .EQ. 1 ) THEN ! Pringle (0.011/2=0.0055)
-            DO layer = 1, nlay_i-1
-               DO ji = kideb , kiut
-                  ztcond_i(ji,layer) = rcdic + 0.09*( s_i_b(ji,layer)   &
-                     + s_i_b(ji,layer+1) ) / MIN(-2.0*zeps,      &
-                     t_i_b(ji,layer)+t_i_b(ji,layer+1)-2.0*rtt) - &
-                     0.0055* ( t_i_b(ji,layer) + t_i_b(ji,layer+1) - 2.0*rtt )  
+                  ztcond_i(ji,layer) = rcdic + zbeta*( s_i_b(ji,layer) + s_i_b(ji,layer+1) ) /  &
+                     MIN(-2.0_wp * zeps, t_i_b(ji,layer)+t_i_b(ji,layer+1) - 2.0_wp * rtt)
                   ztcond_i(ji,layer) = MAX(ztcond_i(ji,layer),zkimin)
                END DO
-            END DO
-         ENDIF
-
-         IF ( thcon_i_swi .EQ. 0 ) THEN ! Untersteiner
-            DO ji = kideb , kiut
-               ztcond_i(ji,nlay_i)   = rcdic + zbeta*s_i_b(ji,nlay_i) / &
-                  MIN(-zeps,t_bo_b(ji)-rtt)
-               ztcond_i(ji,nlay_i)   = MAX(ztcond_i(ji,nlay_i),zkimin)
             END DO
          ENDIF
@@ -373 +351 @@
                DO ji = kideb , kiut
                   ztcond_i(ji,layer) = rcdic + 0.090_wp * ( s_i_b(ji,layer) + s_i_b(ji,layer+1) )   &
-                     &                                  / MIN(-2.0*zeps, t_i_b(ji,layer)+t_i_b(ji,layer+1)-2.0*rtt)   &
+                     &                                  / MIN(-2.0_wp * zeps, t_i_b(ji,layer)+t_i_b(ji,layer+1) - 2.0_wp * rtt)   &
                      &                       - 0.0055_wp* ( t_i_b(ji,layer) + t_i_b(ji,layer+1) - 2.0*rtt )  
                   ztcond_i(ji,layer) = MAX( ztcond_i(ji,layer), zkimin )