Changeset 624 for trunk/NEMO/OPA_SRC/ctlopn.F90

Timestamp:

2007-02-27T15:46:47+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_025:RB: suppress hard-coded logical units except for dimg and coupled

File:

• trunk/NEMO/OPA_SRC/ctlopn.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/ctlopn.F90

@@ -15 +15 @@
       USE Agrif_Util
 #endif
+      USE in_out_manager
       IMPLICIT NONE
 
+      INTEGER, INTENT( out ) ::   &
+         knum      ! logical unit to open
       INTEGER, INTENT( in ) ::   &
-#if !defined key_agrif
-         knum,     & ! logical unit to open
-#endif
          krequ,    & ! =1 file required (stop if not exist)
          !           ! =0 file not required (create the file if does not exist)
          kout,     & ! number of logical units for write
          klengh      ! record length
-
-      INTEGER ::   iost
       CHARACTER (len=* ), INTENT( in ) ::   &
          cdacce,   & ! access specifier
@@ -34 +32 @@
       CHARACTER (len=* ), INTENT( in ) ::   &
          cdfile      ! file name to open
-#endif
-
-      LOGICAL ::  ldwp   ! boolean term for print
-
-#if defined key_agrif
-      LOGICAL :: op
-      INTEGER, INTENT( inout ) ::   &
-         knum      ! logical unit to open
+#else
       CHARACTER (len=* ), INTENT( inout ) ::   &
          cdfile      ! file name to open
 #endif
+
+      INTEGER ::   iost
+      LOGICAL ::  ldwp   ! boolean term for print
+
       !!----------------------------------------------------------------------
       !!  OPA 9.0 , LOCEAN-IPSL (2005) 
@@ -55 +50 @@
          cdfile= TRIM(Agrif_CFixed())//'_'//TRIM(cdfile)
       endif
-      INQUIRE(UNIT=knum,OPENED=op)
-      IF (op) THEN
         knum=Agrif_Get_Unit()
-      ENDIF
+#else
+        knum=getunit()
 #endif