Changeset 3938 for branches/2013/dev_r3406_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

2013-06-26T09:54:16+02:00 (11 years ago)

Author:

flavoni

Message:

dev_r3406_CNRS_LIM3: update LIM3, see ticket #1116

Location:

branches/2013/dev_r3406_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (14 diffs)
• iom_nf90.F90 (modified) (3 diffs)

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

@@ -27 +27 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp           ! MPP library
+   USE timing          ! Timing
 #if defined key_iomput
    USE sbc_oce, ONLY :   nn_fsbc         ! ocean space and time domain
@@ -376 +377 @@
 
 
-   FUNCTION iom_varid ( kiomid, cdvar, kdimsz, ldstop )  
+   FUNCTION iom_varid ( kiomid, cdvar, kdimsz, kndims, ldstop )  
       !!-----------------------------------------------------------------------
       !!                  ***  FUNCTION  iom_varid  ***
@@ -385 +386 @@
       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.)
       !
@@ -416 +418 @@
                   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   
@@ -437 +439 @@
                   ENDIF
                ENDIF
+               IF( PRESENT(kndims) )  kndims = iom_file(kiomid)%ndims(iiv)
             ENDIF
          ENDIF
@@ -959 +962 @@
       CHARACTER(LEN=*), INTENT(in) ::   cdname
       REAL(wp)        , INTENT(in) ::   pfield0d
+      IF( nn_timing == 1 )  CALL timing_start('iom_put0')
 #if defined key_iomput
       CALL event__write_field2D( cdname, RESHAPE( (/pfield0d/), (/1,1/) ) )
@@ -964 +968 @@
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield0d   ! useless test to avoid compilation warnings
 #endif
+      IF( nn_timing == 1 )  CALL timing_stop('iom_put0')
    END SUBROUTINE iom_p0d
 
@@ -970 +975 @@
       REAL(wp),     DIMENSION(:), INTENT(in) ::   pfield1d
       INTEGER :: jpz
+      IF( nn_timing == 1 )  CALL timing_start('iom_put1')
 #if defined key_iomput
       jpz=SIZE(pfield1d)
@@ -976 +982 @@
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield1d   ! useless test to avoid compilation warnings
 #endif
+      IF( nn_timing == 1 )  CALL timing_stop('iom_put1')
    END SUBROUTINE iom_p1d
 
@@ -981 +988 @@
       CHARACTER(LEN=*)            , INTENT(in) ::   cdname
       REAL(wp),     DIMENSION(:,:), INTENT(in) ::   pfield2d
+      IF( nn_timing == 1 )  CALL timing_start('iom_put2')
 #if defined key_iomput
       CALL event__write_field2D( cdname, pfield2d(nldi:nlei, nldj:nlej) )
@@ -986 +994 @@
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield2d   ! useless test to avoid compilation warnings
 #endif
+      IF( nn_timing == 1 )  CALL timing_stop('iom_put2')
    END SUBROUTINE iom_p2d
 
@@ -991 +1000 @@
       CHARACTER(LEN=*)                , INTENT(in) ::   cdname
       REAL(wp),       DIMENSION(:,:,:), INTENT(in) ::   pfield3d
+      IF( nn_timing == 1 )  CALL timing_start('iom_put3')
 #if defined key_iomput
       CALL event__write_field3D( cdname, pfield3d(nldi:nlei, nldj:nlej, :) )
@@ -996 +1006 @@
       IF( .FALSE. )   WRITE(numout,*) cdname, pfield3d   ! useless test to avoid compilation warnings
 #endif
+      IF( nn_timing == 1 )  CALL timing_stop('iom_put3')
    END SUBROUTINE iom_p3d
    !!----------------------------------------------------------------------
@@ -1070 +1081 @@
       CALL event__set_attribut( 'field_definition', attr( field__freq_op, idt           ) )    ! model time-step
       CALL event__set_attribut( 'SBC'             , attr( field__freq_op, idt * nn_fsbc ) )    ! SBC time-step
+ !SF 
+      CALL event__set_attribut( 'scalar_SBC'      , attr( field__freq_op, idt * nn_fsbc ) )    ! SBC time-step
       
       ! output file names (attribut: name)

branches/2013/dev_r3406_CNRS_LIM3/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90

@@ -181 +181 @@
 
 
-   FUNCTION iom_nf90_varid ( kiomid, cdvar, kiv, kdimsz )  
+   FUNCTION iom_nf90_varid ( kiomid, cdvar, kiv, kdimsz, kndims )  
       !!-----------------------------------------------------------------------
       !!                  ***  FUNCTION  iom_varid  ***
@@ -191 +191 @@
       INTEGER              , INTENT(in   )           ::   kiv   ! 
       INTEGER, DIMENSION(:), INTENT(  out), OPTIONAL ::   kdimsz   ! size of the dimensions
+      INTEGER,               INTENT(  out), OPTIONAL ::   kndims   ! size of the dimensions
       !
       INTEGER                        ::   iom_nf90_varid   ! iom variable Id
@@ -242 +243 @@
             ENDIF
          ENDIF
+         IF( PRESENT(kndims) )  kndims = iom_file(kiomid)%ndims(kiv)
       ELSE  
          iom_nf90_varid = -1   !   variable not found, return error code: -1