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

Timestamp:

Jul 3, 2018, 12:50:23 PM (6 years ago)

Author:

jvatant

Message:

Pseudo-evap was done in 2D in the photochem -> now 3D
--JVO

File:

• trunk/LMDZ.TITAN/libf/chimtitan/gptitan.c (modified) (7 diffs)

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

@@ -12 +12 @@
               char CORPS[][10], double Y[][NLEV],
               double *FIN, double *LAT, double *MASS, double MD[][NLEV],
-              double *KEDD, double *botCH4, double *fluxCH4, double KRATE[][NLEV],
+              double *KEDD, double KRATE[][NLEV],
               int reactif[][5], int *nom_prod, int *nom_perte, 
               int prod[][200], int perte[][200][2], int *aerprod, int *utilaer, 
@@ -22 +22 @@
   int    i,j,k,l;
   int    ireac,ncom1,ncom2;
-  int    in2, ich4, ih, ih2, in4s;
+  int    in2, ih, ih2, in4s;
   double  ***a,***b,**c;
   double  *fl,*fp,*mu,**jac,**ym1,**f;
-  double  dyCH4surf;
   double  conv,delta,deltamax;
   double  cm,cp,dim,dip,dm,dp,dym,dyp,km,kp,r,dra,dram,drap;
@@ -100 +99 @@
   for( i = 0; i <= ST-1; i++ ) 
     {
-      if( strcmp(corps[i], "CH4") == 0 ) ich4 = i;
       if( strcmp(corps[i], "H"  ) == 0 ) ih   = i;
       if( strcmp(corps[i], "H2" ) == 0 ) ih2  = i;
@@ -107 +105 @@
     }
 
-  /* initialisation mu, CH4 au sol */
+  /* initialisation mu */
      
   for( j = 0; j <= NLEV-1; j++ )
@@ -114 +112 @@
       for( i = 0; i <= ST-1; i++ ) 
         {
-          if( ( i == ich4 ) && ( Y[i][j] <= *botCH4 ) && ( j == 0 ) )
-            {
-              dyCH4surf = (*botCH4 - Y[i][j]);
-              Y[i][j] = *botCH4;
-            }
           mu[j] += ( MASS[i] * Y[i][j] );
         }
@@ -789 +782 @@
             /* end inversion by blocs: */
 
-            /* CH4 au sol */
-            /* ---------- */
-            if( Y[ich4][0] < *botCH4 )
-                {
-                  dyCH4surf += (*botCH4 - Y[ich4][0]*10.0e0);
-                  Y[ich4][0] = *botCH4;
-                }
-
             /* ------------------ */
             /* Tests et evolution */
@@ -888 +873 @@
   /* ------------ */
 
-  *fluxCH4=dyCH4surf;
-      
   for( j = 0; j <= NLEV-1; j++ ) 
     {