Changes in trunk/src/readageclasses.f90 [27:4]

File:

• trunk/src/readageclasses.f90 (modified) (6 diffs)

trunk/src/readageclasses.f90

@@ -28 +28 @@
   !                                                                            *
   !     Author: A. Stohl                                                       *
+  !                                                                            *
   !     20 March 2000                                                          *
-  !     HSO, 1 July 2014                                                       *
-  !     Added optional namelist input                                          *
   !                                                                            *
   !*****************************************************************************
@@ -47 +46 @@
   integer :: i
 
-  ! namelist help variables
-  integer :: readerror
-
-  ! namelist declaration
-  namelist /ageclass/ &
-    nageclass, &
-    lage
-
-  nageclass=-1 ! preset to negative value to identify failed namelist input
 
   ! If age spectra calculation is switched off, set number of age classes
@@ -67 +57 @@
   endif
 
+
   ! If age spectra claculation is switched on,
   ! open the AGECLASSSES file and read user options
   !************************************************
 
-  open(unitageclasses,file=path(1)(1:length(1))//'AGECLASSES',form='formatted',status='old',err=999)
+  open(unitageclasses,file=path(1)(1:length(1))//'AGECLASSES', &
+       status='old',err=999)
 
-  ! try to read in as a namelist
-  read(unitageclasses,ageclass,iostat=readerror)
-  close(unitageclasses)
+  do i=1,13
+    read(unitageclasses,*)
+  end do
+  read(unitageclasses,*) nageclass
 
-  if ((nageclass.lt.0).or.(readerror.ne.0)) then
-    open(unitageclasses,file=path(1)(1:length(1))//'AGECLASSES',status='old',err=999)
-    do i=1,13
-      read(unitageclasses,*)
-    end do
-    read(unitageclasses,*) nageclass
-    read(unitageclasses,*) lage(1)
-    do i=2,nageclass
-      read(unitageclasses,*) lage(i)
-    end do
-    close(unitageclasses)
-  endif
-
-  ! write ageclasses file in namelist format to output directory if requested
-  if (nmlout.eqv..true.) then
-    open(unitageclasses,file=path(2)(1:length(2))//'AGECLASSES.namelist',err=1000)
-    write(unitageclasses,nml=ageclass)
-    close(unitageclasses)
-  endif
 
   if (nageclass.gt.maxageclass) then
@@ -106 +80 @@
   endif
 
+  read(unitageclasses,*) lage(1)
   if (lage(1).le.0) then
     write(*,*) ' #### FLEXPART MODEL ERROR! AGE OF FIRST      #### '
@@ -114 +89 @@
 
   do i=2,nageclass
+    read(unitageclasses,*) lage(i)
     if (lage(i).le.lage(i-1)) then
       write(*,*) ' #### FLEXPART MODEL ERROR! AGE CLASSES     #### '
@@ -129 +105 @@
   stop
 
-1000  write(*,*) ' #### FLEXPART MODEL ERROR! FILE "AGECLASSES" #### '
-  write(*,*) ' #### CANNOT BE OPENED IN THE DIRECTORY       #### '
-  write(*,'(a)') path(2)(1:length(2))
-  stop
-
-
 end subroutine readageclasses