Changeset 493 for trunk/NEMO/TOP_SRC

Timestamp:

2006-09-01T15:58:46+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_056:CE+RB: change key_trc_dta to key_dtatrc

Location:

trunk/NEMO/TOP_SRC

Files:

• trc.F90 (modified) (3 diffs)
• trcdta.F90 (modified) (9 diffs)
• trcdtr.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/trc.F90

@@ -95 +95 @@
       nrsttr          !!: control of the time step ( 0 or 1 ) for pass. tr.
    
-#if defined key_partial_steps
    
    !! interpolated gradient
@@ -102 +101 @@
       gtru    ,   &   !!: horizontal gradient at u-points at bottom ocean level
       gtrv            !!: horizontal gradient at v-points at bottom ocean level
-#else
-   REAL (wp), PUBLIC :: &
-      gtru    ,   &   !!: horizontal gradient at u-points at bottom ocean level
-      gtrv            !!: horizontal gradient at v-points at bottom ocean level
-   
-#endif
+
    
 #if defined key_trcldf_eiv && defined key_diaeiv
@@ -191 +185 @@
    !! passive tracers data read and at given time_step
    !! --------------------------------------------------
-#if defined key_trc_dta
+#if defined key_dtatrc
    
    INTEGER , PUBLIC, DIMENSION(jptra) :: &

trunk/NEMO/TOP_SRC/trcdta.F90

@@ -9 +9 @@
    !!----------------------------------------------------------------------
 
-#if  defined key_passivetrc && defined key_trc_dta
-   !!----------------------------------------------------------------------
-   !!   'key_trc_dta'                           3D tracer data field
+#if  defined key_passivetrc && defined key_dtatrc
+   !!----------------------------------------------------------------------
+   !!   'key_dtatrc'                           3D tracer data field
    !!----------------------------------------------------------------------
    !!   dta_trc      : read ocean passive tracer data
@@ -71 +71 @@
       !!----------------------------------------------------------------------
       !! * Modules used
-      USE ioipsl
-
-      !! * Arguments
+      USE iom
+
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt     ! ocean time-step
@@ -83 +82 @@
 
       INTEGER ::   &
-         imois, iman, i15, itime, ik, &  ! temporary integers 
-         ipi, ipj, ipk                              !    "        "
-      INTEGER :: istep(jpmois)
+         imois, iman, i15, ik  ! temporary integers 
       CHARACTER (len=39) :: clname(jptra)
-      REAL(wp), DIMENSION (jpi,jpj) ::  zlon, zlat
-      REAL(wp), DIMENSION (jpk) ::  zlev
-      REAL(wp) :: zdate0, zxy, zl
+      REAL(wp) :: zxy, zl
       !!----------------------------------------------------------------------
 
@@ -96 +91 @@
          IF( lutini(jn) ) THEN 
 
-            IF ( kt == nit000 ) THEN
+            IF ( kt == nittrc000 ) THEN
                !! 3D tracer data
                IF(lwp)WRITE(numout,*)
@@ -109 +104 @@
             imois = nmonth + i15 -1
             IF( imois == 0 ) imois = iman
-            itime = jpmois
-            ipi = jpiglo
-            ipj = jpjglo
-            ipk = jpk
+
 
             ! First call kt=nit000
             ! --------------------
 
-            IF ( kt == nit000 .AND. nlectr(jn) == 0 ) THEN
+            IF ( kt == nittrc000 .AND. nlectr(jn) == 0 ) THEN
                ntrc1(jn) = 0
-               IF(lwp) THEN
-                  WRITE(numout,*)
-                  WRITE(numout,*) ' Tracer data  fields' 
-                  WRITE(numout,*) ' ~~~~~~~~~~~~~~~~~~~~~'
-                  WRITE(numout,*) ' NetCDF FORMAT'
-                  WRITE(numout,*)
-               ENDIF
-
+               IF(lwp) WRITE(numout,*) ' trc_dta : Levitus tracer data monthly fields'
                ! open file 
 #if defined key_trc_pisces
                clname(jn) = 'LEVITUS_'//ctrcnm(jn)
 #else
-               itime=1
                clname(jn) = ctrcnm(jn)
 #endif
-               CALL flinopen(TRIM(clname(jn)),mig(1),nlci,mjg(1),nlcj,    &
-                  .FALSE.,ipi,ipj,ipk,zlon,zlat,zlev,itime,    &
-                  istep,zdate0,rdt,numtr(jn)               )
-
-#if defined key_trc_pisces
-               ! title, dimensions and tests
-               IF( itime /= jpmois ) THEN
-                  IF(lwp) THEN
-                     WRITE(numout,*) ' '
-                     WRITE(numout,*) 'problem with time coordinates'
-                     WRITE(numout,*) ' itime ',itime,' jpmois ',jpmois
-                  ENDIF
-                  STOP 'dta_trc'
-               ENDIF
-#endif
-
-               IF( ipi /= jpidta .OR. ipj /= jpjdta .OR. ipk /= jpk ) THEN
-                  IF(lwp) THEN
-                     WRITE(numout,*) ' '
-                     WRITE(numout,*) 'problem with dimensions'
-                     WRITE(numout,*) ' ipi ',ipi,' jpidta ',jpidta
-                     WRITE(numout,*) ' ipj ',ipj,' jpjdta ',jpjdta
-                     WRITE(numout,*) ' ipk ',ipk,' jpk ',jpk
-                  ENDIF
-                  STOP 'dta_trc'
-               ENDIF
-               IF(lwp)WRITE(numout,*) itime,istep(1),zdate0,rdt,numtr(jn)
-               trdta(:,:,:,jn) = 0.
+               CALL iom_open ( clname(jn), numtr(jn) )              
 
             ENDIF
@@ -167 +124 @@
 #if defined key_trc_pisces
             ! Read montly file
-            IF( ( kt == nit000 .AND. nlectr(jn) == 0)   & 
-               .OR. imois /= ntrc1(jn) ) THEN
+            IF( ( kt == nittrc000 .AND. nlectr(jn) == 0)  .OR. imois /= ntrc1(jn) ) THEN
                nlectr(jn) = 1
 
@@ -187 +143 @@
                ! Read montly passive tracer data Levitus 
 
-               CALL flinget( numtr(jn),ctrcnm(jn),jpidta,jpjdta,jpk,    &
-                  jpmois,ntrc1(jn),ntrc1(jn),mig(1),nlci,mjg(1),nlcj,  &
-                  tracdta(1:nlci,1:nlcj,1:jpk,jn,1)                  )
-
-               CALL flinget( numtr(jn),ctrcnm(jn),jpidta,jpjdta,jpk,     &
-                  jpmois,ntrc2(jn),ntrc2(jn),mig(1),nlci,mjg(1),nlcj,   &
-                  tracdta(1:nlci,1:nlcj,1:jpk,jn,2)                  )
+               CALL iom_get ( numtr(jn), jpdom_data, ctrcnm(jn), tracdta(:,:,:,jn,1), ntrc1(jn) )
+               CALL iom_get ( numtr(jn), jpdom_data, ctrcnm(jn), tracdta(:,:,:,jn,2), ntrc2(jn) )
 
                IF(lwp) THEN
@@ -205 +156 @@
                   tracdta(:,:,:  ,jn,jl) = tracdta(:,:,:,jn,jl) * tmask(:,:,:) 
                   tracdta(:,:,jpk,jn,jl) = 0.
-                  IF( lk_zps ) THEN                ! z-coord. with partial steps
+                  IF( ln_zps ) THEN                ! z-coord. with partial steps
                      DO jj = 1, jpj                ! interpolation of temperature at the last level
                         DO ji = 1, jpi
@@ -251 +202 @@
             IF( jn == jpsil) trdta(:,:,:,jn) = trdta(:,:,:,jn) * 1.E-6
             IF( jn == jppo4) trdta(:,:,:,jn) = trdta(:,:,:,jn) * 122.E-6
+
+            ! Close the file
+            ! --------------
+            
+            IF( kt == nitend )   CALL iom_close ( numtr(jn) )
+
 #else
             ! Read init file only
-            IF( kt == nit000  ) THEN
-               CALL flinget( numtr(jn),ctrcnm(jn),jpidta,jpjdta,jpk,    &
-               1,1,1,mig(1),nlci,mjg(1),nlcj,  &
-               trdta(1:nlci,1:nlcj,1:jpk,jn) )
-               trdta(:,:,:,jn)=trdta(:,:,:,jn)*tmask(:,:,:)
+            IF( kt == nittrc000  ) THEN
+               CALL iom_get ( numtr(jn), jpdom_data, ctrcnm(jn), trdta(:,:,:,jn), ntrc1(jn) )
+               trdta(:,:,:,jn) = trdta(:,:,:,jn) * tmask(:,:,:)
+               CALL iom_close ( numtr(jn) )
             ENDIF 
 #endif

trunk/NEMO/TOP_SRC/trcdtr.F90

@@ -250 +250 @@
 #endif
 
-#if defined key_trc_dta
+#if defined key_dtatrc
 !!   Initialization of tracer from a file
 !!   that may also be used for damping
-      CALL dta_trc( nit000 )
+      CALL dta_trc( nittrc000 )
       DO  jk = 1, jptra
         IF( lutini(jk) ) THEN