Index: trunk/mars/README
===================================================================
--- trunk/mars/README	(revision 126)
+++ trunk/mars/README	(revision 131)
@@ -632,8 +632,15 @@
    --> fix by moving the closing "endif" [in addition to corrections mentioned in the previous point]
 
-== 17/10/2011 == EM
+== 17/05/2011 == EM
 >> set internal computations using double precision in growthrate.F and
    watercloud.F (otherwise we sometimes end up with Nans).
 >> add extra checks in newcondens.F to avoid possibility of out of bounds
    evaluation of array masse()
-   
+  
+== 25/05/2011 == AS
+>> found that the 10/05/2011 bug fix in newsedim.F is also useful for GCM runs.
+>> no more need to modify callradite.F prior to compilation [but still dimradmars.h must be modified] 
+   --> in callradite.F we now have
+       -- DEFAULT name_iaer(1) is "dust_conrath"
+       -- IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq"
+       -- IF (water.AND.activice) name_iaer(2) = "h2o_ice"  
Index: trunk/mars/libf/phymars/callradite.F
===================================================================
--- trunk/mars/libf/phymars/callradite.F	(revision 126)
+++ trunk/mars/libf/phymars/callradite.F	(revision 131)
@@ -263,8 +263,9 @@
 c        PLEASE MAKE SURE that you set up the right number of
 c          scatterers in dimradmars.h (naerkind);
-         name_iaer(1) = "dust_conrath"   !! poussiere classique
-c          name_iaer(1) = "dust_doubleq"
-cc        name_iaer(2) = "dust_submicron" !! JB: experimental
-c          name_iaer(2) = "h2o_ice"
+          name_iaer(1) = "dust_conrath"   !! default choice is good old Conrath profile
+          name_iaer(2) = "dummy"          !! default choice is no radiatively-active clouds
+          IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq" !! two-moment scheme
+          IF (water.AND.activice) name_iaer(2) = "h2o_ice"      !! radiatively-active clouds
+          IF (submicron.AND.active) name_iaer(2) = "dust_submicron" !! JBM experimental stuff
 c        ----------------------------------------------------------
 
Index: trunk/mars/libf/phymars/dimradmars.h
===================================================================
--- trunk/mars/libf/phymars/dimradmars.h	(revision 126)
+++ trunk/mars/libf/phymars/dimradmars.h	(revision 131)
@@ -27,6 +27,6 @@
 ! (ex: naerkind=2 if you use one dust mode and active ice ...)
       integer naerkind
-       parameter (naerkind=1)
-!      parameter (naerkind=2)
+!      parameter (naerkind=1)
+       parameter (naerkind=2)
 !!!!!! CHANGE CHANGE nsizemax BELOW BELOW
 
@@ -77,6 +77,6 @@
 !   the radiative calculations.
 
-!      INTEGER, PARAMETER :: nsizemax = 60
-      INTEGER, PARAMETER :: nsizemax = 1
+      INTEGER, PARAMETER :: nsizemax = 60
+!      INTEGER, PARAMETER :: nsizemax = 1
 
 ! Various initialisation for LW radiative code
Index: trunk/mars/libf/phymars/meso_physiq.F
===================================================================
--- trunk/mars/libf/phymars/meso_physiq.F	(revision 126)
+++ trunk/mars/libf/phymars/meso_physiq.F	(revision 131)
@@ -1060,8 +1060,4 @@
          DO ig=1,ngrid
             zdtsurf(ig) = zdtsurf(ig) + zdtsurfc(ig)
-!!!**WRF: newphys: ici la pression n'est plus mise a jour ds le GCM
-!!!**WRF: mais il faut retablir ca dans le cas du mesoscale ?
-!!!**WRF: ...non probablement OK
-!            ps(ig)=pplev(ig,1) + pdpsrf(ig)*ptimestep
          ENDDO
 
@@ -1091,8 +1087,4 @@
 c        ----------------------------------------
          IF (water) THEN
-
-c **WRF: new arguments here rnuclei,rice,nuice
-c  plus no more iqmin +igcm_h2o_vap replaces iq, what are the consequences?
-c  checks needed when tracers simulations
 
            call watercloud(ngrid,nlayer,ptimestep,
@@ -1216,7 +1208,4 @@
            zdqssed(1:ngrid,1:nq)=0
 
-c
-c **WRF: new arguments rnuclei, rice, need checks
-c
            call callsedim(ngrid,nlayer, ptimestep,
      &                pplev,zzlev, pt, rdust, rice,
@@ -1293,7 +1282,4 @@
       ENDDO
 
-ccc
-ccc  **WRF very specific to GCM
-ccc
 c  Prescribe a cold trap at south pole (except at high obliquity !!)
 c  Temperature at the surface is set there to be the temperature
@@ -1325,7 +1311,5 @@
 c              ALWAYS PLACE these lines after newcondens !!!
 c       -------------------------------------------------------------
-c
 c **WRF : OK avec le mesoscale, pas d'indices bizarres au pole
-c
          do ig=1,ngrid
            if ((co2ice(ig).eq.0).and.
@@ -1478,7 +1462,4 @@
            if (water) then
 
-!!
-!!***WRF: ok, des nouveaux trucs cools de la nouvelle physique
-!!
              call zerophys(ngrid,mtot)
              call zerophys(ngrid,icetot)
