Changeset 131 for trunk/mars

Timestamp:

May 25, 2011, 4:19:36 PM (14 years ago)

Author:

aslmd

Message:

mars

M 130 mars/libf/phymars/callradite.F
M 130 mars/README
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"

M 130 000-USERS
small meeting about SVN for "planeto" team

M 130 mars/libf/phymars/meso_physiq.F
purely cosmetic changes

M 130 mesoscale/PLOT/MINIMAL/map_latlon.pro
M 130 mesoscale/PLOT/SPEC/GW/gravitwave2.pro
M 130 mesoscale/PLOT/SPEC/GW/gravitwaveprof.pro
M 130 mesoscale/PLOT/SPEC/GW/gravitwave_inc.pro
A 0 mesoscale/PLOT/SPEC/MAP/defs/THARSIS_newphys_bugnoRAC_RACgcm_TAUTES.map_uvt_inc.pro
M 130 mesoscale/PLOT/SPEC/MAP/map_uvt.pro
graphic stuff for GW studies and H2O cycle

Location:

trunk/mars

Files:

• README (modified) (1 diff)
• libf/phymars/callradite.F (modified) (1 diff)
• libf/phymars/dimradmars.h (modified) (2 diffs)
• libf/phymars/meso_physiq.F (modified) (6 diffs)

trunk/mars/README

@@ -632 +632 @@
    --> 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"  

trunk/mars/libf/phymars/callradite.F

@@ -263 +263 @@
 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        ----------------------------------------------------------
 

trunk/mars/libf/phymars/dimradmars.h

@@ -27 +27 @@
 ! (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 +77 @@
 !   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

trunk/mars/libf/phymars/meso_physiq.F

@@ -1060 +1060 @@
          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 +1087 @@
 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 +1208 @@
            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 +1282 @@
       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 +1311 @@
 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 +1462 @@
            if (water) then
 
-!!
-!!***WRF: ok, des nouveaux trucs cools de la nouvelle physique
-!!
              call zerophys(ngrid,mtot)
              call zerophys(ngrid,icetot)