Changeset 845

Timestamp:

2008-03-13T14:09:49+01:00 (16 years ago)

Author:

cetlod

Message:

change the starting/ending FCF do loop indices and change jptra to jp_cfc, see ticket:83

Location:

branches/dev_001_GM/NEMO/TOP_SRC/CFC

Files:

• trccfc.F90 (modified) (2 diffs)
• trcctl.cfc.h90 (modified) (5 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/CFC/trccfc.F90

@@ -36 +36 @@
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj      ,jp_cfc0:jp_cfc1) ::   qint     ! flux function
 
-   REAL(wp), DIMENSION(jptra) ::   soa1, soa2, soa3, soa4   ! coefficient for solubility of CFC [mol/l/atm]
-   REAL(wp), DIMENSION(jptra) ::   sob1, sob2, sob3         !    "               "
-   REAL(wp), DIMENSION(jptra) ::   sca1, sca2, sca3, sca4   ! coefficients for schmidt number in degre Celcius
+   REAL(wp), DIMENSION(jp_cfc) ::   soa1, soa2, soa3, soa4   ! coefficient for solubility of CFC [mol/l/atm]
+   REAL(wp), DIMENSION(jp_cfc) ::   sob1, sob2, sob3         !    "               "
+   REAL(wp), DIMENSION(jp_cfc) ::   sca1, sca2, sca3, sca4   ! coefficients for schmidt number in degre Celcius
       
    !                          ! coefficients for conversion
@@ -86 +86 @@
       REAL(wp) ::   zak_cfc   ! transfert coefficients
       
-      REAL(wp), DIMENSION(jphem,jptra)   ::   zpatm       ! atmospheric function
+      REAL(wp), DIMENSION(jphem,jp_cfc)   ::   zpatm       ! atmospheric function
       !!----------------------------------------------------------------------
 

branches/dev_001_GM/NEMO/TOP_SRC/CFC/trcctl.cfc.h90

@@ -20 +20 @@
       ! Check number of tracers
       ! -----------------------   
-      IF( jptra > 2) THEN 
+      IF( jp_cfc > 2) THEN 
           IF(lwp) THEN 
               WRITE (numout,*) ' ===>>>> : w a r n i n g '
               WRITE (numout,*) ' =======   ============= '
               WRITE (numout,*)                             &
-              &   ' STOP, change jptra to 1 or 2 in par_CFC module '  
+              &   ' STOP, change jp_cfc to 1 or 2 in par_CFC module '  
           END IF 
           STOP 'TRC_CTL'
@@ -32 +32 @@
       ! Check tracer names
       ! ------------------
-      IF( jptra == 1 ) THEN
+      IF( jp_cfc == 1 ) THEN
          IF ( jp11 == 1 ) THEN
             IF ( ctrcnm(jp11) /= 'CFC11') THEN
@@ -47 +47 @@
       ENDIF
 
-      IF( jptra == 2 ) THEN
+      IF( jp_cfc == 2 ) THEN
          IF ( ctrcnm(jp11) /= 'CFC11' .OR. ctrcnm(jp12) /= 'CFC12' ) THEN 
             ctrcnm(jp11) = 'CFC11'
@@ -60 +60 @@
          WRITE (numout,*) ' =======   ============= '
          WRITE (numout,*) ' we force tracer names'
-         DO jn = 1, jptra
+         DO jn = jp_cfc0, jp_cfc1
             WRITE(numout,*) ' tracer nb: ',jn,' name = ',ctrcnm(jn), ctrcnl(jn)
          END DO
@@ -69 +69 @@
       ! Check tracer units
       ! ------------------
-      DO jn = 1, jptra
+      DO jn = jp_cfc0, jp_cfc1
         IF( ctrcun(jn) /= 'mole/m3' ) THEN
             ctrcun(jn) = 'mole/m3'