Changeset 1319

Timestamp:

2009-02-17T18:58:41+01:00 (15 years ago)

Author:

rblod

Message:

First try to use IOF with AGRIF, see ticket #341

Location:

trunk/NEMO/OPA_SRC

Files:

• IOM/iom.F90 (modified) (5 diffs)
• SBC/fldread.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/IOM/iom.F90

@@ -49 +49 @@
 CONTAINS
 
-   SUBROUTINE iom_open( cdname, kiomid, ldwrt, kdom, kiolib, ldstop )
+   SUBROUTINE iom_open( cdname, kiomid, ldwrt, kdom, kiolib, ldstop, ldiof )
       !!---------------------------------------------------------------------
       !!                   ***  SUBROUTINE  iom_open  ***
@@ -61 +61 @@
       INTEGER         , INTENT(in   ), OPTIONAL ::   kiolib   ! library used to open the file (default = jpnf90) 
       LOGICAL         , INTENT(in   ), OPTIONAL ::   ldstop   ! stop if open to read a non-existing file (default = .TRUE.)
+      LOGICAL         , INTENT(in   ), OPTIONAL ::   ldiof    ! Interp On the Fly, needed for AGRIF (default = .FALSE.)
 
       CHARACTER(LEN=100)    ::   clname    ! the name of the file based on cdname [[+clcpu]+clcpu]
@@ -71 +72 @@
       LOGICAL               ::   llnoov    ! local definition to read overlap
       LOGICAL               ::   llstop    ! local definition of ldstop
+      LOGICAL               ::   lliof     ! local definition of ldiof
       INTEGER               ::   iolib     ! library do we use to open the file
       INTEGER               ::   icnt      ! counter for digits in clcpu (max = jpmax_digits)
@@ -105 +107 @@
       ELSE                         ;   iolib = jpnf90
       ENDIF
+      ! are we using interpolation on the fly?
+      IF( PRESENT(ldiof) ) THEN   ;   lliof = ldiof
+      ELSE                        ;   lliof = .FALSE.
+      ENDIF
       ! do we read the overlap 
       ! ugly patch SM+JMM+RB to overwrite global definition in some cases
@@ -112 +118 @@
       clname   = trim(cdname)
 #if defined key_agrif
-      IF ( .NOT. Agrif_Root() ) THEN
+      IF ( .NOT. Agrif_Root() .AND. .NOT. lliof ) THEN
          iln    = INDEX(clname,'/') 
          cltmpn = clname(1:iln)

trunk/NEMO/OPA_SRC/SBC/fldread.F90

@@ -506 +506 @@
          IF( sdjf%cltype == 'monthly' )   WRITE(sdjf%clname, '(a,"m",i2.2)'  ) TRIM( sdjf%clname     ), kmonth   ! add month
       ENDIF
-      CALL iom_open( sdjf%clname, sdjf%num, ldstop = ldstop )
+      CALL iom_open( sdjf%clname, sdjf%num, ldstop = ldstop, ldiof =  LEN(TRIM(sdjf%wgtname)) > 0 )
       !
    END SUBROUTINE fld_clopn
@@ -677 +677 @@
 
       !! open input data file (non-model grid)
-      CALL iom_open( sd%clname, inum )
+      CALL iom_open( sd%clname, inum, ldiof =  LEN(TRIM(sd%wgtname)) > 0 )
 
       !! get dimensions