Changeset 1506

Timestamp:

Dec 24, 2015, 2:10:58 PM (9 years ago)

Author:

emillour

Message:

Venus GCM:
Some minor modifications to compile/run with gfortran:

• removed reference to intrinsic "ieee_arithmetic" module (only available with gfortran v5 and higher), and replaced calls to intrinsic "ieee_is_nan" with equivalent tests in physiq.F
• added a LAPACK preprocessing flag around calls to dgesv (Lapack subroutine) in new_photochemistry_venus.F90 and adapted MESU and OCCIGEN arch files (GNOME and ADA arch files already include this flag).

EM

Location:

trunk

Files:

• LMDZ.COMMON/arch/arch-X64_MESU.fcm (modified) (1 diff)
• LMDZ.COMMON/arch/arch-X64_OCCIGEN.fcm (modified) (1 diff)
• LMDZ.VENUS/libf/phyvenus/new_photochemistry_venus.F90 (modified) (2 diffs)
• LMDZ.VENUS/libf/phyvenus/physiq.F (modified) (2 diffs)

trunk/LMDZ.COMMON/arch/arch-X64_MESU.fcm

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE FFT_MKL
+%FPP_DEF             NC_DOUBLE LAPACK BLAS FFT_MKL
 %BASE_FFLAGS         -integer-size 32 -real-size 64 -fp-model strict -align all -mcmodel=large -auto -ip
 %PROD_FFLAGS         -O2 

trunk/LMDZ.COMMON/arch/arch-X64_OCCIGEN.fcm

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE FFT_MKL
+%FPP_DEF             NC_DOUBLE LAPACK BLAS FFT_MKL
 %BASE_FFLAGS         -i4 -r8 -auto -mcmodel=medium -align all -fp-model strict
 %PROD_FFLAGS         -O2 -ip -xCORE-AVX2

trunk/LMDZ.VENUS/libf/phyvenus/new_photochemistry_venus.F90

@@ -183 +183 @@
    
       cnew(iz,:) = c(iz,:)
+#ifdef LAPACK
       call dgesv(nesp,1,mat,nesp,indx,cnew(iz,:),nesp,code)
+#else
+   write(*,*) "new_photochemistry_venus error, missing LAPACK routine dgesv"
+   stop
+#endif
 ! eliminate small values
 
@@ -243 +248 @@
    
          cnew(iz,:) = c(iz,:)
+#ifdef LAPACK
          call dgesv(nesp,1,mat,nesp,indx,cnew(iz,:),nesp,code)
+#else
+   write(*,*) "new_photochemistry_venus error, missing LAPACK routine dgesv"
+   stop
+#endif
 
       end if

trunk/LMDZ.VENUS/libf/phyvenus/physiq.F

@@ -69 +69 @@
       USE compo_hedin83_mod2
       use moyzon_mod, only: tmoy
-      use ieee_arithmetic
+!      use ieee_arithmetic
       use temps_mod, only: itau_phy,day_ref,annee_ref
       use logic_mod, only: iflag_trac
@@ -962 +962 @@
 c--------------------
 c   Ce test est necessaire pour eviter Xliq=NaN   
-        IF (ieee_is_nan(d_tr_sed(i,k,1)).OR.
-     &  ieee_is_nan(d_tr_sed(i,k,2))) THEN
+!        IF (ieee_is_nan(d_tr_sed(i,k,1)).OR.
+!     &  ieee_is_nan(d_tr_sed(i,k,2))) THEN
+        IF ((d_tr_sed(i,k,1).ne.d_tr_sed(i,k,1)).OR.
+     &      (d_tr_sed(i,k,2).ne.d_tr_sed(i,k,2))) THEN
         PRINT*,'sedim NaN PROBLEM'
         PRINT*,'d_tr_sed Nan?',d_tr_sed(i,k,:),'Temp',t_seri(i,k)