Changeset 4205 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

2013-11-14T18:02:06+01:00 (11 years ago)

Author:

clem

Message:

 

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (4 diffs)
• iom_def.F90 (modified) (1 diff)
• restart.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -406 +406 @@
 
 
-   FUNCTION iom_varid ( kiomid, cdvar, kdimsz, ldstop )  
+   FUNCTION iom_varid ( kiomid, cdvar, kdimsz, kndims, ldstop )  
       !!-----------------------------------------------------------------------
       !!                  ***  FUNCTION  iom_varid  ***
@@ -415 +415 @@
       CHARACTER(len=*)     , INTENT(in   )           ::   cdvar    ! name of the variable
       INTEGER, DIMENSION(:), INTENT(  out), OPTIONAL ::   kdimsz   ! size of the dimensions
+      INTEGER,               INTENT(  out), OPTIONAL ::   kndims   ! size of the dimensions
       LOGICAL              , INTENT(in   ), OPTIONAL ::   ldstop   ! stop if looking for non-existing variable (default = .TRUE.)
       !
@@ -446 +447 @@
                   SELECT CASE (iom_file(kiomid)%iolib)
                   CASE (jpioipsl )   ;   iom_varid = iom_ioipsl_varid( kiomid, cdvar, iiv, kdimsz )
-                  CASE (jpnf90   )   ;   iom_varid = iom_nf90_varid  ( kiomid, cdvar, iiv, kdimsz )
+                  CASE (jpnf90   )   ;   iom_varid = iom_nf90_varid  ( kiomid, cdvar, iiv, kdimsz, kndims )
                   CASE (jprstdimg)   ;   iom_varid = -1   ! all variables are listed in iom_file
                   CASE DEFAULT   
@@ -467 +468 @@
                   ENDIF
                ENDIF
+               IF( PRESENT(kndims) )  kndims = iom_file(kiomid)%ndims(iiv)
             ENDIF
          ENDIF

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90

@@ -44 +44 @@
 
    INTEGER, PARAMETER, PUBLIC ::   jpmax_files  = 100   !: maximum number of simultaneously opened file
-   INTEGER, PARAMETER, PUBLIC ::   jpmax_vars   = 360  !: maximum number of variables in one file
+   INTEGER, PARAMETER, PUBLIC ::   jpmax_vars   = 600  !: maximum number of variables in one file
    INTEGER, PARAMETER, PUBLIC ::   jpmax_dims   =  4   !: maximum number of dimensions for one variable
    INTEGER, PARAMETER, PUBLIC ::   jpmax_digits =  5   !: maximum number of digits for the cpu number in the file name

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -132 +132 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'rhd'    , rhd       )
 #endif
+                     CALL iom_rstput( kt, nitrst, numrow, 'iatte'  , iatte     ) !clem modif
+                     CALL iom_rstput( kt, nitrst, numrow, 'oatte'  , oatte     ) !clem modif
       IF( kt == nitrst ) THEN
          CALL iom_close( numrow )     ! close the restart file (only at last time step)
@@ -232 +234 @@
       ENDIF
       !
+      CALL iom_get( numror, jpdom_autoglo, 'iatte' , iatte ) ! clem modif
+      CALL iom_get( numror, jpdom_autoglo, 'oatte' , oatte ) ! clem modif
+      !
    END SUBROUTINE rst_read