Changeset 989 for trunk

Timestamp:

Jun 14, 2013, 9:17:44 AM (11 years ago)

Author:

emillour

Message:

Generic GCM:

• Some minor changes so that gcm compiles with gfortran:
  • Added option to compile "long lines" (>132 characters) in makegcm_gfortran
  • Removed use of isnan() in physiq.F90 (it is not a standard function)
  • Avoid possible underflow of psat in watercommon_h.F90
  • Adapted the checks on the *IR and *VI band files to be more strict

EM

Location:

trunk/LMDZ.GENERIC

Files:

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

trunk/LMDZ.GENERIC/README

@@ -960 +960 @@
   - in dyn3d: removed unused inigrads.F wrgrads.F gradsdef.h
               xvik.F (specific to current Mars)
+
+== 14/06/2013 == EM
+- Some minor changes so that gcm compiles with gfortran:
+  - Added option to compile "long lines" (>132 characters) in makegcm_gfortran
+  - Removed use of isnan() in physiq.F90 (it is not a standard function)
+  - Avoid possible underflow of psat in watercommon_h.F90
+  - Adapted the checks on the *IR and *VI band files to be more strict
+

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

@@ -1103 +1103 @@
                   enddo
                   dEtot=cpp*SUM(massarea(:,:)*(dtlscale(:,:)))/totarea
-                  if(isnan(dEtot)) then
-                     print*,'Nan in largescale, abort'
-                     STOP
-                  endif
+!                 if(isnan(dEtot)) then ! NB: isnan() is not a standard function...
+!                    print*,'Nan in largescale, abort'
+!                     STOP
+!                 endif
                   print*,'In largescale atmospheric energy change =',dEtot,' W m-2'
 

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

@@ -33 +33 @@
       logical file_ok
       integer nw, nt, m, mm, file_entries
-      real*8 a, b, ans, y, bpa, bma, T
+      real*8 a, b, ans, y, bpa, bma, T, dummy
 
       character(len=30)  :: temp1
@@ -48 +48 @@
 
       !! used to count lines
-      integer :: nb=-1  !because first line is not an actual value
+      integer :: nb=0
       integer :: ierr=0
 
@@ -94 +94 @@
       ! check that the file contains the right number of bands 
       open(131,file=file_path,form='formatted')
+      read(131,*,iostat=ierr) file_entries
       do while (ierr==0)
-        read(131,*,iostat=ierr) file_entries
+        read(131,*,iostat=ierr) dummy
+!        write(*,*) 'setspi: file_entries:',dummy,'ierr=',ierr
         if (ierr==0) nb=nb+1
       enddo
       close(131)
+
       write(*,*) 'setspi: L_NSPECTI = ',L_NSPECTI, 'in the model '
       write(*,*) '        there are   ',nb, 'entries in ',TRIM(file_path)

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

@@ -44 +44 @@
 
       real*8 STELLAR(L_NSPECTV)
-      real*8 sum
+      real*8 sum, dummy
 
       !! used to count lines
-      integer :: nb=-1  !because first line is not an actual value
+      integer :: nb=0 
       integer :: ierr=0
 
@@ -72 +72 @@
       ! check that the file contains the right number of bands 
       open(131,file=file_path,form='formatted')
+      read(131,*,iostat=ierr) file_entries
       do while (ierr==0)
-        read(131,*,iostat=ierr) file_entries
+        read(131,*,iostat=ierr) dummy
         if (ierr==0) nb=nb+1
       enddo
       close(131)
+
       write(*,*) 'setspv: L_NSPECTV = ',L_NSPECTV, 'in the model '
       write(*,*) '        there are   ',nb, 'entries in ',TRIM(file_path)

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

@@ -61 +61 @@
          else if (T.lt.Tmin) then
             print*, "careful, T<Tmin in psat water"
-            psat = Pref_solid_liquid*Exp(r3sublimation*(Tmin-T_h2O_ice_liq)/(Tmin-Trefsublimation)) ! min psat  
+          !  psat = Pref_solid_liquid*Exp(r3sublimation*(Tmin-T_h2O_ice_liq)/(Tmin-Trefsublimation)) ! min psat  
+         ! Ehouarn: gfortran says: Error: Result of EXP underflows its kind,
+         !          so set psat to the smallest possible value instead
+            psat=tiny(psat)
          else                 
             psat = Pref_solid_liquid*Exp(r3sublimation*(T-T_h2O_ice_liq)/(T-Trefsublimation)) ! solid / vapour

trunk/LMDZ.GENERIC/makegcm_gfortran

@@ -387 +387 @@
 
            ## for gfortran
-           set optim="-g -finit-real=-inf -finit-integer=-999999 -Wall -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow"
-           set optim90="-g -finit-real=-inf -finit-integer=-999999 -Wall -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow"
-           set optimtru90="-g -finit-real=-inf -finit-integer=-999999 -Wall -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optim="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optim90="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optimtru90="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
 
         else 
@@ -653 +653 @@
    set f90=f90
 else if $LINUX then
-   set f77=gfortran
-   set f90=gfortran
+# default for gfortran is that "free format" is up to 132 characters,
+# but we sometimes have more, so move that limit to 264 characters
+   set f77="gfortran -ffree-line-length-264"
+   set f90="gfortran -ffree-line-length-264"
    set opt_link=" -L$LIBOGCM -L$NCDFLIB -lnetcdff -lnetcdf "
 else if $SUN then