Changeset 2409 for trunk

Timestamp:

Sep 17, 2020, 10:42:57 AM (4 years ago)

Author:

emillour

Message:

Mars GCM:
Code tidying : make a "dust_param_mod" module to store dust cycle relevant flags
and variables (and remove them from callkeys.h)
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/aeronomars/inichim_newstart.F90 (modified) (1 diff)
• libf/phymars/aeropacity_mod.F (modified) (3 diffs)
• libf/phymars/callkeys.h (modified) (5 diffs)
• libf/phymars/callradite_mod.F (modified) (1 diff)
• libf/phymars/callsedim_mod.F (modified) (1 diff)
• libf/phymars/co2condens_mod.F (modified) (2 diffs)
• libf/phymars/compute_dtau_mod.F90 (modified) (3 diffs)
• libf/phymars/conf_phys.F (modified) (1 diff)
• libf/phymars/dimradmars_mod.F90 (modified) (3 diffs)
• libf/phymars/dust_param_mod.F90 (added)
• libf/phymars/initracer.F (modified) (1 diff)
• libf/phymars/phys_state_var_init_mod.F90 (modified) (2 diffs)
• libf/phymars/physiq_mod.F (modified) (2 diffs)
• libf/phymars/updatereffrad_mod.F (modified) (1 diff)
• libf/phymars/vdifc_mod.F (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -3140 +3140 @@
 - growthrate.F, microphys.h: addings to take into account the effect of diffusion kinetics on fractionation
 - callsedim_mod.F: sedimentation of HDO as an isotope of water in the microphysics case
+
+== 17/09/2020 == EM
+Code tidying : make a "dust_param_mod" module to store dust cycle relevant flags
+and variables (and remove them from callkeys.h)
+

trunk/LMDZ.MARS/libf/aeronomars/inichim_newstart.F90

@@ -6 +6 @@
       USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
       USE datafile_mod, ONLY: datadir
+      use dust_param_mod, only: doubleq, submicron, dustbin
       implicit none
 

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

@@ -3 +3 @@
       IMPLICIT NONE
 
+      INTEGER :: iddist ! flag for vertical dust ditribution type (when imposed)
+                        ! 0: Pollack90, 1: top set by "topdustref"
+                        ! 2: Viking scenario; =3 MGS scenario
+      REAL :: topdustref ! Dust top altitude (km); only matters only if iddist=1)
       CONTAINS
 
@@ -30 +34 @@
      &            iaer_stormdust_doubleq,
      &            iaer_topdust_doubleq
-
+      use dust_param_mod, only: odpref, freedust
        IMPLICIT NONE
 c=======================================================================
@@ -161 +165 @@
 ! indexes of water ice and dust tracers:
       INTEGER,SAVE :: i_ice=0  ! water ice
-      real,parameter :: odpref=610. ! DOD reference pressure (Pa)
       CHARACTER(LEN=20) :: txt ! to temporarly store text
       CHARACTER(LEN=1) :: txt2 ! to temporarly store text

trunk/LMDZ.MARS/libf/phymars/callkeys.h

@@ -10 +10 @@
      &   ,callnirco2,callnlte,callthermos,callconduct,calleuv           &
      &   ,callmolvis,callmoldiff,thermochem,thermoswater,callemis       &
-     &   ,callg2d,linear,rayleigh,tracer,active,doubleq,submicron       &
-     &   ,lifting,freedust,callddevil,scavenging,sedimentation          &
+     &   ,callg2d,linear,rayleigh,tracer                                &
+     &   ,scavenging,sedimentation                                      &
      &   ,activice,water,tifeedback,microphys,supersat,caps,photochem   &
      &   ,calltherm,callrichsl,callslope,tituscap,callyamada4,co2clouds &
@@ -19 +19 @@
      &   ,hdo,hdofrac
      
-      COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &
-     &   ,dustbin,nltemodel,nircorr,solvarmod,solvaryear,dustinjection
+      COMMON/callkeys_i/iradia,iaervar,ilwd,ilwb,ilwn,ncouche           &
+     &   ,nltemodel,nircorr,solvarmod,solvaryear,dustinjection
      
-      COMMON/callkeys_r/topdustref,semi,alphan,euveff,                  &
+      COMMON/callkeys_r/semi,alphan,euveff,                             &
      &   tke_heat_flux,dustrefir,fixed_euv_value,CLFfixval,             &
      &   coeff_injection,ti_injection,tf_injection,coeff_detrainment
@@ -42 +42 @@
       logical gwd_convective_source
 
-      real topdustref
       real semi
       real alphan
@@ -54 +53 @@
       real CLFfixval
 
-      integer iddist
       integer iaervar
       integer iradia
@@ -67 +65 @@
       logical rayleigh
       logical tracer
-      integer dustbin
-      logical freedust  
-      logical active,doubleq,submicron,lifting,callddevil,scavenging
+      logical scavenging
       logical rdstorm ! rocket dust storm parametrization
       logical slpwind ! entrainment by slope wind parametrization

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

@@ -25 +25 @@
       use lwmain_mod, only: lwmain
       use swmain_mod, only: swmain
+      use dust_param_mod, only: doubleq, active, submicron
       IMPLICIT NONE
 c=======================================================================

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

@@ -27 +27 @@
       USE comcstfi_h, ONLY: g
       USE dimradmars_mod, only: naerkind
+      USE dust_param_mod, ONLY: doubleq
       IMPLICIT NONE
 

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

@@ -27 +27 @@
        use planete_h, only: obliquit
        use comcstfi_h, only: cpp, g, r, pi 
-       
+       use dust_param_mod, only: freedust
+
 #ifndef MESOSCALE
        USE vertical_layers_mod, ONLY: ap, bp
@@ -857 +858 @@
      &                      rho_dust, nuice_sed, nuice_ref,r3n_q
       use comcstfi_h, only: g
-      
+      use dust_param_mod, only: freedust
       IMPLICIT NONE
-      include "callkeys.h" ! for the flags water, microphys and freedust
+      include "callkeys.h" ! for the flags water and microphys
 c
 c

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

@@ -2 +2 @@
 
         IMPLICIT NONE
-
-        include "callkeys.h"
 
         REAL,SAVE :: ti_injection_sol ! time of beginning injection
@@ -23 +21 @@
         USE tracer_mod, only: alpha_lift,igcm_dust_mass,igcm_dust_number
         USE dimradmars_mod, only: tauvis
+        USE dust_param_mod, only: odpref
         
         IMPLICIT NONE
@@ -42 +41 @@
         REAL :: zday_scenario
         REAL,ALLOCATABLE,SAVE :: local_time_prev(:)
-        REAL,PARAMETER :: odpref=610. !DOD reference pressure (Pa)
         
         LOGICAL, SAVE :: firstcall=.TRUE. ! signals first call to physics

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

@@ -45 +45 @@
       use calchim_mod, only: ichemistry
       use co2condens_mod, only: scavco2cond
-      
+      use dust_param_mod, only: dustbin, doubleq, submicron, active,
+     &                          lifting, freedust, callddevil
+      use aeropacity_mod, only: iddist, topdustref
       IMPLICIT NONE
       include "callkeys.h"

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

@@ -103 +103 @@
   REAL,SAVE,ALLOCATABLE :: fluxrad(:) ! Net radiative surface flux (W.m-2)
   REAL,SAVE,ALLOCATABLE :: albedo(:,:) ! Surface albedo in each solar band
-  REAL,SAVE,ALLOCATABLE :: tauscaling(:)   ! Convertion factor for qdust and Ndust
   REAL,SAVE,ALLOCATABLE :: totcloudfrac(:) ! total cloud fraction over the column
 ! aerosol (dust or ice) extinction optical depth  at reference wavelength 
@@ -174 +173 @@
    allocate(fluxrad_sky(ngrid))
    allocate(fluxrad(ngrid))
-   allocate(tauscaling(ngrid))
    allocate(nueffdust(ngrid,nlayer))
    allocate(totcloudfrac(ngrid))
@@ -188 +186 @@
    if (allocated(fluxrad_sky)) deallocate(fluxrad_sky)
    if (allocated(fluxrad))     deallocate(fluxrad)
-   if (allocated(tauscaling))  deallocate(tauscaling)
    if (allocated(nueffdust))   deallocate(nueffdust)
    if (allocated(totcloudfrac))   deallocate(totcloudfrac)

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

@@ -3 +3 @@
        use tracer_mod
        use comcstfi_h, only: pi
+       use dust_param_mod, only: doubleq, submicron, dustbin
        IMPLICIT NONE
 c=======================================================================

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

@@ -60 +60 @@
       use nonoro_gwd_ran_mod, only: ini_nonoro_gwd_ran, &
                                     end_nonoro_gwd_ran
+      use dust_param_mod, only: ini_dust_param_mod, &
+                                end_dust_param_mod
 
       IMPLICIT NONE
@@ -156 +158 @@
       call ini_nonoro_gwd_ran(ngrid,nlayer)
 
+      ! allocate arrays in "dust_param_mod"
+      call end_dust_param_mod
+      call ini_dust_param_mod(ngrid)
 
       END SUBROUTINE phys_state_var_init

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

@@ -54 +54 @@
       use conc_mod, only: rnew, cpnew, mmean
       use time_phylmdz_mod, only: iphysiq, day_step, ecritstart, daysec
-      use dimradmars_mod, only: tauscaling, aerosol, totcloudfrac,
+      use dimradmars_mod, only: aerosol, totcloudfrac,
      &                          dtrad, fluxrad_sky, fluxrad, albedo,
      &                          naerkind, iaer_dust_doubleq, 
      &                          iaer_stormdust_doubleq
+      use dust_param_mod, only: doubleq, lifting, callddevil,
+     &                          tauscaling, odpref, dustbin
       use turb_mod, only: q2, wstar, ustar, sensibFlux, 
      &                    zmax_th, hfmax_th, turb_resolved
@@ -292 +294 @@
                                     !            - in a mesh with background dust only (true)
       
-      real,parameter :: odpref=610. ! DOD reference pressure (Pa)
       REAL tau(ngrid,naerkind)     ! Column dust optical depth at each point
                                    ! AS: TBD: this one should be in a module !

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

@@ -22 +22 @@
      &            iaer_dust_submicron,iaer_h2o_ice,
      &            iaer_stormdust_doubleq,iaer_topdust_doubleq 
-
+       use dust_param_mod, only: doubleq, active
        IMPLICIT NONE
 c=======================================================================

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

@@ -26 +26 @@
       use compute_dtau_mod, only: ti_injection_sol,tf_injection_sol
       use hdo_surfex_mod, only: hdo_surfex
+      use dust_param_mod, only: doubleq, submicron, lifting
 
       IMPLICIT NONE