Changeset 219 for trunk/NEMO/OPA_SRC

Timestamp:

2005-03-18T15:59:45+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE154 : move the closing file step done in mppstop subroutine (in lib_mpp.F90) in the subroutine opa_closefile (in opa.F90)

Location:

trunk/NEMO/OPA_SRC

Files:

• lib_mpp.F90 (modified) (1 diff)
• opa.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -2792 +2792 @@
     !!
     !!----------------------------------------------------------------------
-    !! * Modules used
-    USE cpl_oce        ! ???
-    USE dtatem         ! ???
-    USE dtasal         ! ???
-    USE dtasst         ! ???
-
     !! * Local declarations
     INTEGER ::   info
     !!----------------------------------------------------------------------
 
-    CALL mppsync
-
-    ! 1. Unit close
-    ! -------------
-
-    CLOSE( numnam )       ! namelist
-    CLOSE( numout )       ! standard model output file
-    CLOSE( numstp )       ! time-step file
-    CLOSE( numwrs )       ! ocean restart file
-
-!!!bug      IF(lwp .AND. lk_isl ) CLOSE( numisp )
-
-    IF( lk_dtatem )   CLOSE( numtdt )
-    IF( lk_dtasal )   CLOSE( numsdt )
-    IF( lk_dtasst )   CLOSE( numsst )
-
-     !!bug      CLOSE( numfl1 )
-
-    IF(lwp) CLOSE( numsol )
-
-    IF( lk_cpl ) THEN
-       CLOSE( numlhf )
-       CLOSE( numlts )
-    ENDIF
-
-
-    ! 2. Mpp synchroneus
+    ! 1. Mpp synchroneus
     ! ------------------
 
-    CLOSE( numwri )
     CALL mppsync
 #if defined key_mpp_mpi

trunk/NEMO/OPA_SRC/opa.F90

@@ -233 +233 @@
       ENDIF
 
+      CALL opa_closefile
       IF( lk_mpp )   CALL mppstop                          ! Close all files (mpp)
 
@@ -275 +276 @@
    END SUBROUTINE opa_flg
 
+   SUBROUTINE opa_closefile
+      !!----------------------------------------------------------------------
+      !!                     ***  ROUTINE opa_closefile  ***
+      !!
+      !! ** Purpose :   Close the files
+      !!           
+      !! ** Method  : 
+      !!
+      !! History :
+      !!   9.0  !  05-01  (O. Le Galloudec)  Original code
+      !!----------------------------------------------------------------------
+      !! * Modules used
+      USE dtatem        ! temperature data
+      USE dtasal        ! salinity data
+      USE dtasst        ! sea surface temperature data
+      !!----------------------------------------------------------------------
+
+      IF ( lk_mpp ) CALL mppsync
+
+      ! 1. Unit close
+      ! -------------
+
+      CLOSE( numnam )       ! namelist
+      CLOSE( numout )       ! standard model output file
+      CLOSE( numstp )       ! time-step file
+      CLOSE( numwrs )       ! ocean restart file
+
+      IF( lk_dtatem )   CLOSE( numtdt )
+      IF( lk_dtasal )   CLOSE( numsdt )
+      IF( lk_dtasst )   CLOSE( numsst )
+
+      IF(lwp) CLOSE( numsol )
+
+      IF( lk_cpl ) THEN
+         CLOSE( numlhf )
+         CLOSE( numlts )
+      ENDIF
+
+      CLOSE( numwri )
+
+   END SUBROUTINE opa_closefile
+
    !!======================================================================
 END MODULE opa