Changeset 2051 for branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtatem.F90

Timestamp:

2010-08-13T10:47:35+02:00 (14 years ago)

Author:

cbricaud

Message:

corrections to use on-the-fly interpolation with 3D files in fldread

File:

• branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtatem.F90 (modified) (4 diffs)

branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -73 +73 @@
 
       !! * Local declarations
-      INTEGER ::   ji, jj, jk, jl, jkk            ! dummy loop indicies
-      INTEGER ::   imois, iman, i15 , ik          ! temporary integers
-      INTEGER ::   ierror
+      INTEGER ::   ji, jj, jk, jl, jkk       ! dummy loop indicies
+      INTEGER ::   &
+        imois, iman, i15 , ik      ! temporary integers
+      INTEGER            :: ierror
 #if defined key_tradmp
-      INTEGER ::   il0, il1, ii0, ii1, ij0, ij1   ! temporary integers
-#endif
-      REAL(wp)::   zxy, zl
-#if defined key_orca_lev10
-      INTEGER ::   ikr, ikw, ikt, jjk 
-      REAL(wp)::   zfac
-#endif
-      REAL(wp), DIMENSION(jpk) ::   ztemdta            ! auxiliary array for interpolation
-      CHARACTER(len=100)       ::   cn_dir             ! Root directory for location of ssr files
-      TYPE(FLD_N)              ::   sn_tem
-      LOGICAL , SAVE           ::   linit_tem = .FALSE.
+      INTEGER ::   &
+         il0, il1, ii0, ii1, ij0, ij1   ! temporary integers
+#endif
+      REAL(wp) ::   zxy, zl
+#if defined key_orca_lev10
+      !!!REAL(wp), DIMENSION(jpi,jpj,jpkdta,2) :: ztem
+      INTEGER   :: ikr, ikw, ikt, jjk 
+      REAL(wp)  :: zfac
+#endif
+      REAL(wp), DIMENSION(jpk) ::   &
+         ztemdta            ! auxiliary array for interpolation
+      CHARACTER(len=100) :: cn_dir          ! Root directory for location of ssr files
+      TYPE(FLD_N)        :: sn_tem
+      LOGICAL , SAVE     :: linit_tem = .FALSE.
       !!----------------------------------------------------------------------
       NAMELIST/namdta_tem/cn_dir,sn_tem
@@ -103 +107 @@
          sn_tem = FLD_N( 'temperature',  -1.  ,  'votemper',  .false.   , .true.  ,  'yearly'  , ''       , ''         )
 
-         REWIND( numnam )            ! ... read in namlist namdta_tem 
+         REWIND( numnam )         ! ... read in namlist namdta_tem 
          READ( numnam, namdta_tem ) 
 
-         IF(lwp) THEN                ! control print
+         IF(lwp) THEN              ! control print
             WRITE(numout,*)
             WRITE(numout,*) 'dta_tem : Temperature Climatology '
@@ -117 +121 @@
 
 #if defined key_orca_lev10
-         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpkdta  ) )
+         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpkdta)   )
          ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpkdta,2) )
 #else
-         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk  ) )
+         ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)   )
          ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
 #endif
@@ -141 +145 @@
          
 #if defined key_tradmp
-      IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN
+      IF( cp_cfg == "orca"  .AND. jp_cfg == 2 ) THEN
             
          !                                        ! =======================