Changeset 772 for branches/dev_001_GM/NEMO/TOP_SRC/PISCES_SMS/p4zrem.F

Timestamp:

2007-12-17T12:59:33+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - change the name of cpp key to key_top, key_lobster, key_pisces, key_kriest and the corresponding lk_

File:

• branches/dev_001_GM/NEMO/TOP_SRC/PISCES_SMS/p4zrem.F (modified) (4 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/PISCES_SMS/p4zrem.F

@@ -6 +6 @@
 CDIR$ LIST
       SUBROUTINE p4zrem
-#if defined key_passivetrc && defined key_trc_pisces
+#if defined key_top && defined key_pisces
 CCC---------------------------------------------------------------------
 CCC
@@ -181 +181 @@
          orem(ji,jj,jk)=remip*trn(ji,jj,jk,jppoc)
          ofer(ji,jj,jk)=remip*trn(ji,jj,jk,jpsfe)
-#if ! defined key_trc_kriest
+#if ! defined key_kriest
          orem2(ji,jj,jk)=remip*trn(ji,jj,jk,jpgoc)
          ofer2(ji,jj,jk)=remip*trn(ji,jj,jk,jpbfe)
@@ -231 +231 @@
      &     +4.*trn(ji,jj,jk,jpfer)*xkeq))/(2.*xkeq)
 
-#if ! defined key_trc_kriest
+#if ! defined key_kriest
          xlam1b=3E-5+xlam1*(trn(ji,jj,jk,jppoc)
      &     +trn(ji,jj,jk,jpgoc)+trn(ji,jj,jk,jpcal)+
@@ -251 +251 @@
          zlamfac=max(0.,(gphit(ji,jj)+55.)/30.)
          zlamfac=min(1.,zlamfac)
-#if ! defined key_trc_kriest
+#if ! defined key_kriest
          xlam1b=(80.*(trn(ji,jj,jk,jpdoc)+35E-6)+698.
      &    *trn(ji,jj,jk,jppoc)+1.05E4*trn(ji,jj,jk,jpgoc))