Changeset 547 for trunk/NEMO/OPA_SRC/IOM

Timestamp:

2006-10-20T17:45:39+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_078:RB: finalization of IOM (2)

Location:

trunk/NEMO/OPA_SRC/IOM

Files:

• in_out_manager.F90 (modified) (3 diffs)
• iom.F90 (modified) (2 diffs)
• iom_def.F90 (modified) (1 diff)
• iom_rstdimg.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -25 +25 @@
    CHARACTER (len=16) ::   cexper     = "exp0"    !: experiment name used for output filename
    LOGICAL            ::   ln_rstart  = .FALSE.   !: start from (F) rest or (T) a restart file
+   LOGICAL            ::   ln_ctl     = .FALSE.   !: run control for debugging
    INTEGER            ::   no         = 0         !: job number
    INTEGER            ::   nrstdt     = 0         !: control of the time step (0, 1 or 2)
@@ -32 +33 @@
    INTEGER            ::   nleapy     = 0         !: Leap year calendar flag (0/1 or 30)
    INTEGER            ::   ninist     = 0         !: initial state output flag (0/1)
-   INTEGER            ::   nstock     =   10      !: restart file frequency
-   INTEGER            ::   nwrite     =   10      !: restart file frequency
+   INTEGER            ::   nbench     = 0         !: benchmark parameter (0/1)
    
    !!----------------------------------------------------------------------
    !!                    output monitoring
    !!----------------------------------------------------------------------
-   LOGICAL            ::   ln_ctl     = .FALSE.   !: run control for debugging
+   INTEGER            ::   nstock     =   10      !: restart file frequency
    INTEGER            ::   nprint     =    0      !: level of print (0 no print)
+   INTEGER            ::   nwrite     =   10      !: restart file frequency
    INTEGER            ::   nictls     =    0      !: Start i indice for the SUM control
    INTEGER            ::   nictle     =    0      !: End   i indice for the SUM control
@@ -47 +48 @@
    INTEGER            ::   jsplt      =    1      !: number of processors following j
    INTEGER            ::   ijsplt     =    1      !: nb of local domain = nb of processors
-   INTEGER            ::   nbench     =    0      !: benchmark parameter (0/1)
-   INTEGER            ::   nbit_cmp   =    0      !: bit comparison mode parameter (0/1)
 
    !!----------------------------------------------------------------------

trunk/NEMO/OPA_SRC/IOM/iom.F90

@@ -57 +57 @@
       LOGICAL         , INTENT(in   ), OPTIONAL ::   ldwrt    ! open in write modeb          (default = .FALSE.)
       INTEGER         , INTENT(in   ), OPTIONAL ::   kdom     ! Type of domain to be written (default = jpdom_local_noovlap)
-      INTEGER         , INTENT(in   ), OPTIONAL ::   kiolib   ! library used to open the file (default = jpioipsl) 
+      INTEGER         , INTENT(in   ), OPTIONAL ::   kiolib   ! library used to open the file (default = jpnf90) 
 
       CHARACTER(LEN=100)    ::   clname    ! the name of the file based on cdname [[+clcpu]+clcpu]
@@ -94 +94 @@
       ! what library do we use to open the file?
       IF( PRESENT(kiolib) ) THEN   ;   iolib = kiolib
-      ELSE                         ;   iolib = jpioipsl
+      ELSE                         ;   iolib = jpnf90
       ENDIF
       ! create the file name by added, if needed, TRIM(Agrif_CFixed()) and TRIM(clsuffix)

trunk/NEMO/OPA_SRC/IOM/iom_def.F90

@@ -22 +22 @@
    INTEGER, PARAMETER, PUBLIC ::   jpnf90      = 101     !: Use nf90 library
    INTEGER, PARAMETER, PUBLIC ::   jprstdimg   = 102     !: Use restart dimgs (fortran direct acces) library
+#if defined key_dimgout
+   INTEGER, PARAMETER, PUBLIC ::   jprstlib  = jprstdimg  !: restarts io library
+#else
+   INTEGER, PARAMETER, PUBLIC ::   jprstlib  = jpnf90     !: restarts io library
+#endif
 
    INTEGER, PARAMETER, PUBLIC ::   jp_r8    = 200     !: 

trunk/NEMO/OPA_SRC/IOM/iom_rstdimg.F90

@@ -167 +167 @@
             iom_file(kiomid)%irec  = 2
             ! store file informations
-            WRITE(idrst, REC = 1, IOSTAT = ios, ERR = 987) irecl8, kdompar(1,1), kdompar(2,1), jpk
+            WRITE( idrst, REC = 1, IOSTAT = ios, ERR = 987 ) irecl8, kdompar(:,1), jpk   ! store domain size
          ENDIF
       ENDIF
@@ -200 +200 @@
       idrst = iom_file(kiomid)%nfid   ! get back the logical unit of the restart file
       ! test if we can write in the file (test with INQUIRE gives alsways YES even with read only files...)
-      READ(  idrst, REC = 1, IOSTAT = ios, ERR = 987 ) irecl8
-      WRITE( idrst, REC = 1, IOSTAT = ios            ) irecl8
-      ! We can write un the file => we update its header before closing
+      READ(  idrst, REC = 1, IOSTAT = ios, ERR = 987 ) irecl8, inx, iny, inz   
+      WRITE( idrst, REC = 1, IOSTAT = ios            ) irecl8, inx, iny, inz   
+      ! We can write in the file => we update its header before closing
       IF( ios == 0 ) THEN
-         READ( idrst, REC = 1, IOSTAT = ios, ERR = 987 ) irecl8, inx, iny, inz
+         READ( idrst, REC = 1, IOSTAT = ios, ERR = 987 ) irecl8, inx, iny, inz   ! get back domain size
          ivnum = iom_file(kiomid)%nvars
          in0d = 0   ;   in2d = 0   ;   in3d = 0