Changeset 472 for trunk

Timestamp:

Dec 14, 2011, 8:47:53 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

fixed bug in callsedim.F: recomputation of rdust and rice should only be done

if the appropriate tracers and flags are set.

commented out call to uertst in ch.F (uertst crashes with gfortran and is

moreover puerly diagnostic messages).

In nltecool.F: Enforced using igcm_* indexes to identify tracers and not

hard coded fixed numbers (which would lead to a disaster in cases where the
order of tracers was changed).

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/aeronomars/ch.F (modified) (1 diff)
• libf/phymars/callsedim.F (modified) (4 diffs)
• libf/phymars/nltecool.F (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -1330 +1330 @@
   with a change in arguments.
 
-
+== 14/12/2011 == EM
+>> fixed bug in callsedim.F: recomputation of rdust and rice should only be done
+   if the appropriate tracers and flags are set.
+>> commented out call to uertst in ch.F (uertst crashes with gfortran and is
+   moreover puerly diagnostic messages).
+>> In nltecool.F: Enforced using igcm_* indexes to identify tracers and not
+   hard coded fixed numbers (which would lead to a disaster in cases where the
+   order of tracers was changed).
+

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

@@ -416 +416 @@
   220 dcadre = cadre                                                            
  9000 continue                                                                  
-      if (ier .ne. 0) call uertst (ier,6hdcadre)                                
+!      if (ier .ne. 0) call uertst (ier,6hdcadre)                                
  9005 return                                                                    
       end     

trunk/LMDZ.MARS/libf/phymars/callsedim.F

@@ -418 +418 @@
 c     Update the dust particle size "rdust"
 c     -------------------------------------
-      DO l = 1, nlay
+      if (doubleq) then
+       DO l = 1, nlay
         DO ig=1,ngrid
           rdust(ig,l)=
@@ -425 +426 @@
           rdust(ig,l)=min(max(rdust(ig,l),1.e-10),500.e-6)
         ENDDO
-      ENDDO
+       ENDDO
+      endif !of if (doubleq)
       
 c     Update the ice particle size "rice"
@@ -449 +451 @@
         ENDDO
       ELSE
+       if (water) then
         DO l = 1, nlay
           DO ig=1,ngrid
@@ -459 +462 @@
           ENDDO
         ENDDO
-      ENDIF
+       endif ! of if (water)
+      ENDIF ! of IF (scavenging)
 
       RETURN

trunk/LMDZ.MARS/libf/phymars/nltecool.F

@@ -179 +179 @@
                !Dynamic composition
                if(nltemodel.eq.1) then
-                  co2(i)=pq(j,i,1)*mmean(j,i)/mmol(1)
-                  o3p(i)=pq(j,i,3)*mmean(j,i)/mmol(3)
-                  n2co(i)=pq(j,i,2)*mmean(j,i)/mmol(2) +
-     $                 pq(j,i,12)*mmean(j,i)/mmol(12)
+                  co2(i)=pq(j,i,igcm_co2)*mmean(j,i)/mmol(igcm_co2)
+                  o3p(i)=pq(j,i,igcm_o)*mmean(j,i)/mmol(igcm_o)
+                  n2co(i)=pq(j,i,igcm_co)*mmean(j,i)/mmol(igcm_co) +
+     $                 pq(j,i,igcm_n2)*mmean(j,i)/mmol(igcm_n2)
                endif