Changeset 772 for branches/dev_001_GM/NEMO/TOP_SRC/trcrst.F90

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/trcrst.F90 (modified) (6 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/trcrst.F90

@@ -6 +6 @@
    !! History :   1.0  !  2007-02 (C. Ethe) adaptation from the ocean
    !!----------------------------------------------------------------------
-#if defined key_passivetrc
-   !!----------------------------------------------------------------------
-   !!   'key_passivetrc'                                    Passive tracers
+#if defined key_top
+   !!----------------------------------------------------------------------
+   !!   'key_top'                                                TOP models
    !!----------------------------------------------------------------------
    !!   trc_rst_opn    : open  restart file
@@ -87 +87 @@
       INTEGER  ::   iarak0
       REAL(wp) ::   zkt, zarak0
-# if defined key_trc_pisces 
+# if defined key_pisces 
       REAL(wp) ::   ztrasum
       INTEGER  ::   ji, jj, jk
@@ -149 +149 @@
          CALL iom_get( numrtr, jpdom_local, 'TRB'//ctrcnm(jn), trb(:,:,:,jn) ) 
       END DO
-# if defined key_trc_lobster1
+# if defined key_lobster
       CALL iom_get( numrtr, jpdom_local, 'SEDB'//ctrcnm(jpdet), sedpocb(:,:) ) 
       CALL iom_get( numrtr, jpdom_local, 'SEDN'//ctrcnm(jpdet), sedpocn(:,:) ) 
-# elif defined key_trc_pisces
+# elif defined key_pisces
       CALL iom_get( numrtr, jpdom_local, 'Silicalim', xksi(:,:) ) 
       xksimax = xksi
@@ -162 +162 @@
 # endif
 
-# if defined key_trc_pisces 
+# if defined key_pisces 
       !                                                         ! --------------------------- !
       IF( cp_cfg == "orca" .AND. .NOT. lk_trccfg_1d ) THEN      ! ORCA condiguration (not 1D) !
@@ -245 +245 @@
       ENDIF
 
-!#if defined key_trc_kriest
+!#if defined key_kriest
 !      !! Initialize number of particles from a standart restart file
 !      !! The name of big organic particles jpgoc has been only change
@@ -312 +312 @@
          END DO
 
-#if defined key_trc_lobster1
+#if defined key_lobster
          CALL iom_rstput( kt, nitrst, numrtw, 'SEDB'//ctrcnm(jpdet), sedpocb(:,:) )
          CALL iom_rstput( kt, nitrst, numrtw, 'SEDN'//ctrcnm(jpdet), sedpocn(:,:) )
-#elif defined key_trc_pisces
+#elif defined key_pisces
          CALL iom_rstput( kt, nitrst, numrtw, 'Silicalim', xksi(:,:) )