Changeset 2051 for branches/DEV_r1784_3DF/NEMO/OPA_SRC/DTA/dtasal.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/dtasal.F90 (modified) (2 diffs)

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

@@ -68 +68 @@
       
       !! * 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
+      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) ::   zsaldta            ! auxiliary array for interpolation
-      CHARACTER(len=100)       :: cn_dir          ! Root directory for location of ssr files
-      TYPE(FLD_N)              :: sn_sal
-      LOGICAL , SAVE           :: linit_sal = .FALSE.
+      INTEGER   :: ikr, ikw, ikt, jjk
+      REAL(wp)  :: zfac
+#endif
+      REAL(wp), DIMENSION(jpk) ::   &
+          zsaldta            ! auxiliary array for interpolation
+      CHARACTER(len=100) :: cn_dir          ! Root directory for location of ssr files
+      TYPE(FLD_N)        :: sn_sal
+      LOGICAL , SAVE     :: linit_sal = .FALSE.
       !!----------------------------------------------------------------------
       NAMELIST/namdta_sal/cn_dir,sn_sal
@@ -110 +114 @@
              CALL ctl_stop( 'dta_sal: unable to allocate sf_sal structure' )   ;   RETURN
          ENDIF
-#if defined key_orca_lev10
-         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpkdta  ) )
-         ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpkdta,2) )
-#else
-         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk  ) )
+         ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk) )
          ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
-#endif
 
          ! fill sf_sal with sn_sal and control print