Changeset 1290

Timestamp:

2009-02-03T15:20:37+01:00 (15 years ago)

Author:

cetlod

Message:

open files with subroutine ctlopn in sediment model, see ticket:319

Location:

trunk/NEMO/TOP_SRC/SED

Files:

• sedini.F90 (modified) (5 diffs)
• sedmodel.F90 (modified) (3 diffs)

trunk/NEMO/TOP_SRC/SED/sedini.F90

@@ -76 +76 @@
       !!----------------------------------------------------------------------
       INTEGER :: ji, jj, ikt
-      CHARACTER (len=28) :: csedname 
+      CHARACTER (len=40) :: csedout
 #if defined key_sed_off
       INTEGER  :: numblt         
@@ -88 +88 @@
       !---------------------------------------
 
-      csedname = 'sediment.output'
-      CALL ctlopn( numsed, csedname, 'OLD', 'FORMATTED', 'SEQUENTIAL', 1, numout, .FALSE., 1 )
+      csedout = 'sediment.output'
+      CALL ctlopn( numsed, csedout, 'OLD', 'FORMATTED', 'SEQUENTIAL', &
+      &            1, numout, .FALSE., 1 )
 
       WRITE(numsed,*)
@@ -226 +227 @@
 #if defined key_sed_off
       REAL(wp) , DIMENSION (jpi,jpj) :: zdta
-      INTEGER  ::  numpres = 52
+      INTEGER  ::  numpres
 #endif
       !---------------------------------------------------------- 
@@ -428 +429 @@
 
       INTEGER :: jn, jn1
-
+      CHARACTER(len=40) :: csednam
       !-------------------------------------------------------
 
@@ -441 +442 @@
 
       ! Reading namelist.sed variables
-      !---------------------------------------
-      OPEN( UNIT = numnamsed, FILE = 'namelist.sediment', FORM = 'FORMATTED', STATUS = 'OLD' )
+      !---------------------------------
+      csednam = 'namelist.sediment'
+      CALL ctlopn( numnamsed, csednam, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
+         &         1, numout, .FALSE., 1 )
 
       dtsed = rdt

trunk/NEMO/TOP_SRC/SED/sedmodel.F90

@@ -14 +14 @@
    !! * Routine accessibility
    PUBLIC sed_model  ! called by step.F90
+
+   LOGICAL, PUBLIC, PARAMETER ::   lk_sed = .TRUE.     !: sediment flag
 
 CONTAINS
@@ -33 +35 @@
 
 
-      !
-      !  Initialization of sediment model
-      ! -----------------------------------
+      IF( kt == nit000 ) CALL sed_init       ! Initialization of sediment model
 
-      IF( kt == nit000 ) CALL sed_init
-
-
-      !! Time stepping of Sediment model
-      !!-----------------------------------
-
-      CALL sed_stp( kt )
+                         CALL sed_stp( kt )  ! Time stepping of Sediment model
 
 
@@ -52 +46 @@
    !! MODULE sedmodel  :   Dummy module 
    !!======================================================================
+   LOGICAL, PUBLIC, PARAMETER ::   lk_sed = .FALSE.     !: sediment flag
 CONTAINS
    SUBROUTINE sed_model( kt )         ! Empty routine