Changeset 2449 for trunk

Timestamp:

Jan 25, 2021, 5:10:00 PM (4 years ago)

Author:

emillour

Message:

Mars GCM:
Minor cleanup and update in aeropacity_mod.F and read_dust_scenario.F90 to be
able to use MY35 dust scenario.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/aeropacity_mod.F (modified) (1 diff)
• libf/phymars/read_dust_scenario.F90 (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -3266 +3266 @@
   the binning reference
 + add outputs for topdust in physiq_mod
+
+== 25/01/2021 == EM
+- Minor cleanup and update in aeropacity_mod.F and read_dust_scenario.F90 to be
+  able to use MY35 dust scenario

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

@@ -287 +287 @@
         call read_dust_scenario(ngrid,nlayer,zday,pplev,
      &                          tau_pref_scenario)
-      ELSE IF ((iaervar.ge.24).and.(iaervar.le.34))
+      ELSE IF ((iaervar.ge.24).and.(iaervar.le.35))
      &     THEN  ! << MY... dust scenarios >>
         call read_dust_scenario(ngrid,nlayer,zday,pplev,

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

@@ -66 +66 @@
    else if (iaervar.eq.8) then
      filename="dust_clim.nc"
-   else if (iaervar.eq.24) then
-     filename="dust_MY24.nc"
-   else if (iaervar.eq.25) then
-     filename="dust_MY25.nc" 
-   else if (iaervar.eq.26) then
-     filename="dust_MY26.nc"
-   else if (iaervar.eq.27) then
-     filename="dust_MY27.nc"
-   else if (iaervar.eq.28) then
-     filename="dust_MY28.nc"
-   else if (iaervar.eq.29) then
-     filename="dust_MY29.nc"   
-   else if (iaervar.eq.30) then
-     filename="dust_MY30.nc"   
-   else if (iaervar.eq.31) then
-     filename="dust_MY31.nc"
-   else if (iaervar.eq.32) then
-     filename="dust_MY32.nc"
-   else if (iaervar.eq.33) then
-     filename="dust_MY33.nc"
-   else if (iaervar.eq.34) then
-     filename="dust_MY34.nc"
+   else if ((iaervar.ge.24).and.(iaervar.le.35)) then
+     write(filename,'(a7,i2,a3)')"dust_MY",iaervar,".nc"
    ! 124,125,126: old TES assimilated dust scenarios (at 700Pa ref pressure!)
    else if  (iaervar.eq.124) then