Changeset 1908 for trunk/LMDZ.TITAN/libf/chimtitan

Timestamp:

Mar 8, 2018, 5:16:35 PM (7 years ago)

Author:

jvatant

Message:

Making chemistry handling more flexible - Major and Final Step (hopefully) !
After preliminary commits r1871-86-87-91-94-98, here comes the major update of the interface
with photochemical module + fix how tendencies for chem and mufi tracers are managed in physiq_mod !
+ Major modifs in :
++ calchim.F90 to comply with flexible resolution, parallelism, upper pressure grid ...
++ physiq_mod.F90 where there was a bug on the update of the tracers and their tendencies for calchim

and calmufi ( we actually were sending non-updated fields to these processes )
We also now put the same tendency on all longitudes within a lat band and not
relative tendency if 2D chemistry ( and we set to zero if ever negs are created )

+ Also modifs to have chemistry in 1D in rcm1d ( and moved gr_kim_vervack in phytitan to be accessible for 1d )
+ In chemistry added a check.c to verify coherence of sizes between C and Fortran
--JVO

Location:

trunk/LMDZ.TITAN/libf/chimtitan

Files:

• check.c (added)
• gptitan.c (modified) (11 diffs)
• titan.h (modified) (1 diff)

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

@@ -1 +1 @@
 /* gptitan: photochimie */
 /* GCCM */
-
-/* tout est passe en simple precision */
-/* sauf pour l'inversion de la matrice */
 
 /* nitriles et hydrocarbures separes pour l'inversion */
@@ -14 +11 @@
      double *RA, double *TEMP, double *NB, 
      char CORPS[][10], double Y[][NLEV],
-     double *FIN, int *LAT, double *MASS, double MD[][NLEV],
+     double *FIN, double *LAT, double *MASS, double MD[][NLEV],
      double *KEDD, double *botCH4, double KRATE[][NLEV],
      int reactif[][5], int *nom_prod, int *nom_perte, 
@@ -53 +50 @@
 
 /* DEBUG */
-      printf("CHIMIE: lat=%d\n",(*LAT)+1);
+      printf("CHIMIE: lat=%g\n",(*LAT));
 /**/
 
@@ -65 +62 @@
    strcat( outlog, ".log" );
    out = fopen( outlog, "w" );
-   fprintf(out,"CHIMIE: lat=%d\n",(*LAT)+1);
+   fprintf(out,"CHIMIE: lat=%g\n",(*LAT));
    fclose( out );
 
@@ -79 +76 @@
 /*  DEBUG 
             out = fopen( outlog, "a" );
-   fprintf(out,"CHIMIE: lat=%d\n",(*LAT)+1);
+   fprintf(out,"CHIMIE: lat=%g\n",(*LAT));
             fclose( out );
 */
@@ -236 +233 @@
              }
 /* DEBUG
-printf("AERPROD : LAT = %d - J = %d\n",(*LAT),j);
+printf("AERPROD : LAT = %g - J = %d\n",(*LAT),j);
 if(fabs(dyc2h2*NB[j])>fabs(fp[utilaer[2]]/10.))
       printf("fp(%s) =%e; dyc2h2 =%e\n",corps[utilaer[2]],
@@ -286 +283 @@
 
 /* DEBUG 
-printf("HTOH2 : LAT = %d - J = %d\n",(*LAT),j);
+printf("HTOH2 : LAT = %g - J = %d\n",(*LAT),j);
 if(fabs(dyh*NB[j])>fabs(fp[utilaer[0]]/10.))
 printf("fp(%s) = %e; dyh  = %e\n",corps[utilaer[0]],fp[utilaer[0]],dyh*NB[j]);
@@ -511 +508 @@
                   {
                      out = fopen( outlog, "a" );
-                     fprintf( out, "Lat no %d;", (*LAT)+1);
+                     fprintf( out, "Latitude %g;", (*LAT));
                      fprintf(out, " alt:%e; %s %e %e ; %e %e\n",(RA[j]-R0),corps[i],ym1[i],Y[i][j],time,delta);
                      fclose( out );
@@ -666 +663 @@
              }
 /* DEBUG
-printf("AERPROD : LAT = %d - J = %d\n",(*LAT),j);
+printf("AERPROD : LAT = %g - J = %d\n",(*LAT),j);
 if(fabs(dyc2h2*NB[j])>fabs(fp[utilaer[2]]/10.))
       printf("fp(%s) =%e; dyc2h2 =%e\n",corps[utilaer[2]],
@@ -716 +713 @@
 
 /* DEBUG 
-printf("HTOH2 : LAT = %d - J = %d\n",(*LAT),j);
+printf("HTOH2 : LAT = %g - J = %d\n",(*LAT),j);
 if(fabs(dyh*NB[j])>fabs(fp[utilaer[0]]/10.))
 printf("fp(%s) = %e; dyh  = %e\n",corps[utilaer[0]],fp[utilaer[0]],dyh*NB[j]);
@@ -810 +807 @@
                   {
                      out = fopen( outlog, "a" );
-                     fprintf( out, "Lat no %d; declin:%e;", (*LAT)+1, (*DECLIN) );
+                     fprintf( out, "Latitude: %g; declin:%e;", (*LAT), (*DECLIN) );
                      fprintf(out, " alt:%e; %s %e %e ; %e %e\n",(RA[j]-R0),corps[i],ym1[i],Y[i][j],time,delta);
                      fclose( out );

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

@@ -7 +7 @@
 
 #define R0    (double)(2575.0) /* Titan's radius */
-#define NLEV  (int)(125)  /* Nbre de niv verticaux - =llm+70 dans common_mod */
-#define NLD   (int)(40)   /* Nbre de niv verticaux faits sans diff */
+#define NLEV  (int)(133)  /* Nbre de niv verticaux - =llm+70 dans common_mod -> 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 */