Changeset 1965

Timestamp:

Jul 5, 2018, 4:25:51 PM (7 years ago)

Author:

jvatant

Message:

Replace Numerical Recipes "solve.c" in C chemistry by "solve_lapack.c" call to Lapack dgesv
-> ~60 times quicker ( quasi-instantaneous now )
--JVO

Location:

trunk

Files:

• LMDZ.COMMON/arch/arch-X64_OCCIGEN.fcm (modified) (1 diff)
• LMDZ.TITAN/README (modified) (1 diff)
• LMDZ.TITAN/libf/chimtitan/gptitan.c (modified) (3 diffs)
• LMDZ.TITAN/libf/chimtitan/solve_lapack.c (added)
• LMDZ.TITAN/libf/chimtitan/titan.h (modified) (2 diffs)

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

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
-%CPP_FLAGS           -P -I${MKL_INC_DIR}
+%CPP_FLAGS           -P
 %FPP_DEF             NC_DOUBLE LAPACK BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
 %CPP_DEF             LAPACK

trunk/LMDZ.TITAN/README

@@ -1484 +1484 @@
 Add surface methane CH4 flux pseudo-evaporation diagnostic.
 Evap was done in 2D inside the photochem before -> now 3D.
+
+== 05/07/18 == JVO
+Replace Numerical Recipes "solve.c" in C chemistry by "solve_lapack.c" call to Lapack dgesv
+-> ~60 times quicker ( quasi-instantaneous now )

trunk/LMDZ.TITAN/libf/chimtitan/gptitan.c

@@ -51 +51 @@
   /* DEBUG */
   printf("CHIMIE: lat=%g\n",(*LAT));
+  /**/
+
+  /* Warning about computational time */
+#ifndef LAPACK
+  printf("Hey there !! LAPACK key is turned off, the chemistry could be way quicker if you were activating it !\n");
+#endif
   /**/
 
@@ -467 +473 @@
       for( j = NLD+1; j <= NLEV-1; j++ )
         {
+#ifdef LAPACK
+          solve_lapack( a, j-1, 0, ST-1 );
+#else
           solve( a, j-1, 0, ST-1 );
+#endif
           for( i = 0; i <= ST-1; i++ )
             {
@@ -479 +489 @@
             }
         }
+#ifdef LAPACK
+      solve_lapack( a, NLEV-1, 0, ST-1 );
+#else
       solve( a, NLEV-1, 0, ST-1 );
+#endif
       for( j = NLEV-1; j >= NLD; j-- )     
         {

trunk/LMDZ.TITAN/libf/chimtitan/titan.h

@@ -7 +7 @@
 
 #define R0    (double)(2575.0) /* Titan's radius */
-#define NLEV  (int)(133)  /* Nbre de niv verticaux - =llm+70 dans common_mod -> Need to be coherent with the vertical grid used !! */
+#define NLEV  (int)(133)  /* Nbre de niv verticaux -> Need to be coherent with the vertical grid used !! */
 #define NLD   (int)(40)   /* Nbre de niv verticaux faits sans diff -> Need to be coherent with the vertical grid used !! */
 #define NLRT  (int)(650)  /* Nbre de niv verticaux dans table fmoy - aussi dans common_mod */
@@ -40 +40 @@
 double omega( double, double, double );
 void  solve( double ***, int, int, int );
+void  solve_lapack( double ***, int, int, int );
 void  solve_b( double ***, double **, int, int, int );
 float *rm1d( int, int );