Changeset 1278 for trunk

Timestamp:

Jun 2, 2014, 11:22:51 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• Add possibility to use clim or MY31 dust scenarios (and realistic EUV for MY31).

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/aeronomars/param_read_e107.F (modified) (1 diff)
• libf/phymars/aeropacity.F (modified) (1 diff)
• libf/phymars/physiq.F (modified) (1 diff)
• libf/phymars/read_dust_scenario.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/README

@@ -2129 +2129 @@
   are used).
 
-
+== 02/06/2014 == EM
+- Add possibility to use clim or MY31 dust scenarios (and realistic EUV for MY31).
+

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

@@ -261 +261 @@
       else if(solvaryear.eq.30) then
          filename="e107_MY30.dat"
+      else if(solvaryear.eq.31) then
+         filename="e107_MY31.dat"
       else
          write(*,*)"param_read_e107: "
          write(*,*)"bad value for solvaryear in callphys.def"
-         write(*,*)"solvaryear must be between 24 and 30"
+         write(*,*)"solvaryear must be between 24 and 31"
          stop
       endif

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

@@ -242 +242 @@
           tauref(ig) = tauref(1)
         end do
-      ELSE IF ((iaervar.ge.6).and.(iaervar.le.7)) THEN
-      ! cold or warm synthetic scenarios
+      ELSE IF ((iaervar.ge.6).and.(iaervar.le.8)) THEN
+      ! clim, cold or warm synthetic scenarios
         call read_dust_scenario(ngrid,nlayer,zday,pplev,tauref)
-      ELSE IF ((iaervar.ge.24).and.(iaervar.le.30))
+      ELSE IF ((iaervar.ge.24).and.(iaervar.le.31))
      &     THEN  ! << MY... dust scenarios >>
         call read_dust_scenario(ngrid,nlayer,zday,pplev,tauref)

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

@@ -1739 +1739 @@
      &                    "H2O ice volume mixing ratio","mol/mol",
      &                    3,vmr)
+              ! also store vmr_ice*rice for better diagnostics of rice
+               vmr(1:ngrid,1:nlayer)=vmr(1:ngrid,1:nlayer)*
+     &                               zq(1:ngrid,1:nlayer,igcm_h2o_ice)
+               call wstats(ngrid,"vmr_h2oice_rice",
+     &                "H2O ice mixing ratio times ice particule size",
+     &                    "(mol/mol)*m",
+     &                    3,vmr)
                vmr=zqsat(1:ngrid,1:nlayer)
      &      *mmean(1:ngrid,1:nlayer)/mmol(igcm_h2o_vap)

trunk/LMDZ.MARS/libf/phymars/read_dust_scenario.F90

@@ -49 +49 @@
    ! iaervar=6 means read dust_cold.nc file
    ! iaervar=7 means read dust_warm.nc file
+   ! iaervar=8 means read dust_clim.nc file
    ! iaervar=24 means read dust_MY24.nc file
    ! iaervar=25 means read dust_MY25.nc file
@@ -59 +60 @@
    else if (iaervar.eq.7) then
      filename="dust_warm.nc"
+   else if (iaervar.eq.8) then
+     filename="dust_clim.nc"
    else if (iaervar.eq.24) then
      filename="dust_MY24.nc"
@@ -73 +76 @@
    else if (iaervar.eq.30) then
      filename="dust_MY30.nc"   
+   else if (iaervar.eq.31) then
+     filename="dust_MY31.nc"
    ! 124,125,126: old TES assimilated dust scenarios (at 700Pa ref pressure!)
    else if  (iaervar.eq.124) then