Changeset 1499 for trunk/LMDZ.MARS/libf

Timestamp:

Nov 19, 2015, 4:04:48 PM (10 years ago)

Author:

emillour

Message:

Mars GCM:

• Added option "-cpp" so that users can add the definition of specific precompiling flags in makegcm_* scripts (and added default BLAS and LAPACK flags for ifort on Gnome and Ada).
• Put calls to dgesv (Lapack) routine in photochemistry_asis.F90 under the LAPACK preprocessing flag. Moved secondary routines in photochemistry.F and photochemistry_asis.F90 into the main (via contains instruction) to avoid multiple definitions of routines with identical names.

EM

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• photochemistry.F (modified) (5 diffs)
• photochemistry_asis.F90 (modified) (8 diffs)

trunk/LMDZ.MARS/libf/aeronomars/photochemistry.F

@@ -167 +167 @@
       call chimtogcm(nlayer, nq, zycol, lswitch, nesp, rm) 
 
-      return
-      end
+      contains
+
 
 c*****************************************************************
@@ -755 +755 @@
       end do
 
-      return
-      end
+      end subroutine chimie
 
 c*****************************************************************
@@ -857 +856 @@
       end do
 
-      return
-      end
+      end subroutine gcmtochim
 
 c*****************************************************************
@@ -943 +941 @@
       end if
 
-      return
-      end
+      end subroutine chimtogcm
 
 c*****************************************************************
@@ -1564 +1561 @@
       end if
 c
-      return
-      end
+      end subroutine chemrates
+
+      end subroutine photochemistry

trunk/LMDZ.MARS/libf/aeronomars/photochemistry_asis.F90

@@ -221 +221 @@
    cnew(:) = c(ilev,:)
 
+#ifdef LAPACK
    call dgesv(nesp,1,mat,nesp,indx,cnew,nesp,code)
-
+#else
+   write(*,*) "photochemistry_asis error, missing LAPACK routine dgesv"
+   stop
+#endif
 !  eliminate small values
 
@@ -287 +291 @@
       cnew(:) = c(ilev,:)
 
+#ifdef LAPACK
       call dgesv(nesp,1,mat,nesp,indx,cnew,nesp,code)
-
+#else
+   write(*,*) "photochemistry_asis error, missing LAPACK routine dgesv"
+   stop
+#endif
    end if
 
@@ -351 +359 @@
                i_n, i_n2d, i_no, i_no2, i_n2, dens, c) 
 
-return
-end
+contains
 
 !======================================================================
@@ -958 +965 @@
       v_phot(:,nb_phot) = h005(:)
 
-return
-end
+end subroutine reactionrates
 
 !======================================================================
@@ -1075 +1081 @@
 end do
 
-return
-end
+end subroutine fill_matrix
 
 !================================================================
@@ -1580 +1585 @@
 end if  
 
-return
-end
+end subroutine indice
 
 !*****************************************************************
@@ -1748 +1752 @@
       end do
 
-      return
-      end
+      end subroutine gcmtochim
 
 !*****************************************************************
@@ -1820 +1823 @@
       end do 
 
-      return
-      end
+      end subroutine chimtogcm
+
+end subroutine photochemistry_asis
+