Changeset 963 for IOIPSL/trunk/src/getincom.f90

Timestamp:

03/31/10 17:26:11 (15 years ago)

Author:

bellier

Message:

Added the "getin_name" subroutine which allows the user
to change the name of the definition file in which
the data will be read. ("run.def" by default)

File:

• IOIPSL/trunk/src/getincom.f90 (modified) (12 diffs)

IOIPSL/trunk/src/getincom.f90

@@ -13 +13 @@
 !-
 PRIVATE
-PUBLIC :: getin, getin_dump
+PUBLIC :: getin_name, getin, getin_dump
+!-
+!!--------------------------------------------------------------------
+!! The "getin_name" routine allows the user to change the name
+!! of the definition file in which the data will be read.
+!! ("run.def" by default)
+!!
+!!  SUBROUTINE getin_name (file_name)
+!!
+!! OPTIONAL INPUT argument
+!!
+!! (C) file_name :  the name of the file
+!!                  in which the data will be read
+!!--------------------------------------------------------------------
+!-
 !-
 INTERFACE getin
@@ -19 +33 @@
 !! The "getin" routines get a variable.
 !! We first check if we find it in the database
-!! and if not we get it from the run.def file.
+!! and if not we get it from the definition file.
 !!
 !! SUBROUTINE getin (target,ret_val)
@@ -41 +55 @@
 !!--------------------------------------------------------------------
 !! The "getin_dump" routine will dump the content of the database
-!! into a file which has the same format as the run.def file.
+!! into a file which has the same format as the definition file.
 !! The idea is that the user can see which parameters were used
 !! and re-use the file for another run.
@@ -57 +71 @@
   INTEGER,SAVE      :: nbfiles
 !-
+  INTEGER,SAVE :: allread=0
+  CHARACTER(LEN=100),SAVE :: def_file = 'run.def'
+!-
   INTEGER,PARAMETER :: i_txtslab=1000,l_n=30
   INTEGER,SAVE :: nb_lines,i_txtsize=0
@@ -78 +95 @@
 !-
 ! keystatus definition
-! keystatus = 1 : Value comes from run.def
+! keystatus = 1 : Value comes from the file defined by 'def_file'
 ! keystatus = 2 : Default value is used
 ! keystatus = 3 : Some vector elements were taken from default
@@ -112 +129 @@
 !-
 CONTAINS
+!-
+!=== DEFINITION FILE NAME INTERFACE
+!-
+SUBROUTINE getin_name (cname)
+!---------------------------------------------------------------------
+  IMPLICIT NONE
+!-
+  CHARACTER(LEN=*) :: cname
+!---------------------------------------------------------------------
+  IF (allread == 0) THEN
+    def_file = ADJUSTL(cname)
+  ELSE
+    CALL ipslerr (3,'getin_name', &
+ &   'The name of the database file (any_name.def)', &
+ &   'must be changed *before* any attempt','to read the database.')
+  ENDIF
+!------------------------
+END SUBROUTINE getin_name
 !-
 !=== INTEGER INTERFACE
@@ -1008 +1043 @@
   IMPLICIT NONE
 !-
-  INTEGER,SAVE :: allread=0
   INTEGER,SAVE :: current
 !---------------------------------------------------------------------
@@ -1021 +1055 @@
 !-- Start with reading the files
     nbfiles = 1
-    filelist(1) = 'run.def'
+    filelist(1) = TRIM(def_file)
     current = 1
 !--
@@ -1146 +1180 @@
 !-
   IF (check) THEN
-    OPEN (UNIT=22,file='run.def.test')
+    OPEN (UNIT=22,file=TRIM(def_file)//'.test')
     DO i=1,nb_lines
       WRITE(UNIT=22,FMT=*) targetlist(i)," : ",fichier(i)
@@ -1416 +1450 @@
 !-
   TYPE(t_key),ALLOCATABLE,DIMENSION(:) :: tmp_key_tab
-  CHARACTER(LEN=100),ALLOCATABLE :: tmp_str(:)
 !-
   INTEGER :: ier
@@ -1787 +1820 @@
         CASE(1)
           WRITE(22,*) '# Values of ', &
- &          TRIM(key_tab(ikey)%keystr),' comes from the run.def.'
+ &          TRIM(key_tab(ikey)%keystr),' comes from ',TRIM(def_file)
         CASE(2)
           WRITE(22,*) '# Values of ', &
@@ -1794 +1827 @@
           WRITE(22,*) '# Values of ', &
  &          TRIM(key_tab(ikey)%keystr), &
- &          ' are a mix of run.def and defaults.'
+ &          ' are a mix of ',TRIM(def_file),' and defaults.'
         CASE DEFAULT
           WRITE(22,*) '# Dont know from where the value of ', &