Changeset 1046

Timestamp:

2008-06-02T12:24:22+02:00 (16 years ago)

Author:

cetlod

Message:

local computation of freezing point in trcadv_cen2.F90 routine, see ticket:181

File:

• trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90 (modified) (2 diffs)

trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90

@@ -137 +137 @@
          zfui1, zfvj1                          !    "         "
 #endif
+#if defined key_lim3 || defined key_lim2
+      REAL(wp) ::                           &
+         ztfreez                               ! freezing point
+#endif
       CHARACTER (len=22) :: charout
       !!----------------------------------------------------------------------
@@ -166 +170 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
+#if defined key_lim3 || defined key_lim2
+               ztfreez = ( - 0.0575 + 1.710523e-3 * SQRT( sn(ji,jj,1) )   &
+                 &                  - 2.154996e-4 *       sn(ji,jj,1)   ) * sn(ji,jj,1)
+
                zind(ji,jj,jk) = MAX (   &
                   rnfmsk(ji,jj) * rnfmsk_z(jk),      &  ! near runoff mouths (& closed sea outflows)
                   upsmsk(ji,jj)                      &  ! some of some straits
-#if defined key_lim3 || defined key_lim2
                   !                                     ! below ice covered area (if tn < "freezing"+0.1 )
-                  , MAX(  0., SIGN( 1., fzptn(ji,jj) + 0.1 - tn(ji,jj,jk) )  ) * tmask(ji,jj,jk)   &
-#endif
+                  , MAX(  0., SIGN( 1., ztfreez + 0.1 - tn(ji,jj,jk) )  ) * tmask(ji,jj,jk)   &
                   &                  )
+
+#else
+               zind(ji,jj,jk) = MAX (   &
+                  rnfmsk(ji,jj) * rnfmsk_z(jk),      &  ! near runoff mouths (& closed sea outflows)
+                  upsmsk(ji,jj)                      &  ! some of some straits
+                  &                  )
+#endif
             END DO
          END DO