Changeset 789 for trunk/LMDZ.GENERIC

Timestamp:

Sep 20, 2012, 3:34:10 PM (12 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC
A more robust way to count lines in setspi and setspv.
bandlen.txt file is no longer used. This was causing problems with MPI computations.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/setspi.F90 (modified) (2 diffs)
• libf/phystd/setspv.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/README

@@ -830 +830 @@
   ... to be conservative I kept this behaviour and highlighted it with an array nueffrad_dummy
   ... I added a comment because someone might want to change this
+
+== 20/09/2012 == AS
+A more robust way to count lines in setspi and setspv. 
+bandlen.txt file is no longer used. This was causing problems with MPI computations.

trunk/LMDZ.GENERIC/libf/phystd/setspi.F90

@@ -46 +46 @@
       
       real*8 :: lastband(2), plancksum
+
+      !! used to count lines
+      integer :: nb=-1  !because first line is not an actual value
+      integer :: ierr=0
 
       logical forceEC, planckcheck
@@ -87 +91 @@
          call abort
       endif
-      
-      ! check that the file contains the right number of bands
-      call system('wc -l '//file_path//' > bandlen.txt')
-      open(131,file='bandlen.txt', form='formatted')
-      read(131,*) file_entries
+    
+      ! check that the file contains the right number of bands 
+      open(131,file=file_path,form='formatted')
+      do while (ierr==0)
+        read(131,*,iostat=ierr) file_entries
+        if (ierr==0) nb=nb+1
+      enddo
       close(131)
-      call system('rm -f bandlen.txt')
-
-      if(file_entries-1.ne.L_NSPECTI) then
-         write(*,*) 'setspi: L_NSPECTI = ',L_NSPECTI, 'in the model, but there are '
-         write(*,*) file_entries-1,'entries in ', &
-              TRIM(file_path),', exiting.'
+      write(*,*) 'setspi: L_NSPECTI = ',L_NSPECTI, 'in the model '
+      write(*,*) '        there are   ',nb, 'entries in ',TRIM(file_path)
+      if(nb.ne.L_NSPECTI) then
+         write(*,*) 'MISMATCH !! I stop here'
          call abort
       endif

trunk/LMDZ.GENERIC/libf/phystd/setspv.F90

@@ -46 +46 @@
       real*8 sum
 
+      !! used to count lines
+      integer :: nb=-1  !because first line is not an actual value
+      integer :: ierr=0
+
 !=======================================================================
 !     Set up spectral bands - wavenumber [cm^(-1)]. Go from smaller to
@@ -65 +69 @@
          call abort
       endif
-      
-      ! check that the file contains the right number of bands
-      call system('wc -l '//file_path//' > bandlen.txt')
-      open(131,file='bandlen.txt', form='formatted')
-      read(131,*) file_entries
+    
+      ! check that the file contains the right number of bands 
+      open(131,file=file_path,form='formatted')
+      do while (ierr==0)
+        read(131,*,iostat=ierr) file_entries
+        if (ierr==0) nb=nb+1
+      enddo
       close(131)
-      call system('rm -f bandlen.txt')
-
-      if(file_entries-1.ne.L_NSPECTV) then
-         write(*,*) 'setspv: L_NSPECTV = ',L_NSPECTV, 'in the model, but there are '
-         write(*,*) file_entries-1,'entries in ', &
-              TRIM(file_path),', exiting.'
+      write(*,*) 'setspv: L_NSPECTV = ',L_NSPECTV, 'in the model '
+      write(*,*) '        there are   ',nb, 'entries in ',TRIM(file_path)
+      if(nb.ne.L_NSPECTV) then
+         write(*,*) 'MISMATCH !! I stop here'
          call abort
       endif