Changeset 107 for trunk/NEMO

Timestamp:

2004-06-28T11:36:01+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE068 : Add binary output possibilities with the dimg output format

Location:

trunk/NEMO

Files:

• LIM_SRC/limrst.F90 (modified) (1 diff)
• LIM_SRC/limrst_dimg.h90 (added)
• LIM_SRC/limwri.F90 (modified) (2 diffs)
• LIM_SRC/limwri_dimg.h90 (added)
• OPA_SRC/DOM/domwri.F90 (modified) (4 diffs)
• OPA_SRC/DOM/domwri_dimg.h90 (added)
• OPA_SRC/restart.F90 (modified) (1 diff)
• OPA_SRC/restart_dimg.h90 (added)

trunk/NEMO/LIM_SRC/limrst.F90

@@ -37 +37 @@
    !!----------------------------------------------------------------------
 #  include "limrst_fdir.h90"
+
+# elif ( defined key_mpp_mpi || defined key_mpp_shmem ) && defined key_dimgout
+   !!----------------------------------------------------------------------
+   !!   'key_mpp_mpi'     OR
+   !!   'key_mpp_shmem'
+   !!   'key_dimgout' :                           clipper type restart file
+   !!                 :                     can be used in mpp
+   !!----------------------------------------------------------------------
+#  include "limrst_dimg.h90"
 
 # else

trunk/NEMO/LIM_SRC/limwri.F90

@@ -55 +55 @@
 
 CONTAINS
+#if defined key_dimgout
+
+# include "limwri_dimg.h90"
+
+#else
 
    SUBROUTINE lim_wri
@@ -197 +202 @@
       
    END SUBROUTINE lim_wri
-
+#endif
+   
    SUBROUTINE lim_wri_init
       !!-------------------------------------------------------------------

trunk/NEMO/OPA_SRC/DOM/domwri.F90

@@ -9 +9 @@
    !!                    nmsh = 1  :   mesh_mask file
    !!                         = 2  :   mesh and mask file
-   !!                         = 3  :   mesh_hgr, dom_zgr and mask
+   !!                         = 3  :   mesh_hgr, mesh_zgr and mask
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -31 +31 @@
    !!----------------------------------------------------------------------
 #  include "domwri_fdir.h90"
+
+#elif ( defined key_mpp_mpi || defined key_mpp_shmem ) && defined key_dimgout
+   !!----------------------------------------------------------------------
+   !!   'key_mpp_mpi'     OR
+   !!   'key_mpp_shmem'
+   !!   'key_dimgout' :         each processor makes its own direct access file 
+   !!                      use build_nc_meshmask off line to retrieve 
+   !!                      a ioipsl compliant meshmask file
+   !!----------------------------------------------------------------------
+#  include "domwri_dimg.h90"
+
 
 #else
@@ -51 +62 @@
       !!                    nmsh = 1  :   'mesh_mask.nc' file
       !!                         = 2  :   'mesh.nc' and mask.nc' files
-      !!                         = 3  :   'mesh_hgr.nc', 'dom_zgr.nc' and
+      !!                         = 3  :   'mesh_hgr.nc', 'mesh_zgr.nc' and
       !!                                  'mask.nc' files
       !!      For huge size domain, use option 2 or 3 depending on your 
@@ -130 +141 @@
             &             jpk   , gdept , trim(clnam3)        ,  &   ! in unit inum3
             &             itime , zdate0, rdt   , inum3          )
-            CALL restini( 'NONE', jpi   , jpj   , glamt, gphit,  &   ! create 'mesh.nc' file
+            CALL restini( 'NONE', jpi   , jpj   , glamt, gphit,  &   ! create 'mesh_zgr.nc' file
             &             jpk   , gdept , trim(clnam4)        ,  &   ! in unit inum4
             &             itime , zdate0, rdt   , inum4          )

trunk/NEMO/OPA_SRC/restart.F90

@@ -45 +45 @@
 #  include "restart_fdir.h90"
 
-#elif  ( defined key_mpp_mpi   ||   defined key_mpp_shmem )
+#elif  ( defined key_mpp_mpi   ||   defined key_mpp_shmem ) && defined key_dimgout
    !!----------------------------------------------------------------------
    !!   'key_mpp_mpi'     OR      MPI massively parallel processing library
    !!   'key_mpp_shmem'         SHMEM massively parallel processing library
+   !!                     AND
+   !!   'key_dimgout'          
    !!----------------------------------------------------------------------
    !!                 direct acces file one per processor
    !!          (merging/splitting is done off-line, eventually)
    !!-----------------------------------------------------------------------
-#  include "restart_mpp.h90"
+#  include "restart_dimg.h90"
 
 #else