Changeset 1655 for trunk

Timestamp:

Feb 2, 2017, 6:07:31 PM (8 years ago)

Author:

aslmd

Message:

corrected bugs from rev 1651 that prevented the mesoscale model from compiling. getin does not take double precision arguments. removed meteoriticflux_mod and included the variables in tracer_mod.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• co2cloud.F (modified) (2 diffs)
• conf_phys.F (modified) (4 diffs)
• meteoriticflux_mod.F90 (deleted)
• tracer_mod.F90 (modified) (1 diff)

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

@@ -14 +14 @@
      &     igcm_ccnco2_mass, igcm_ccnco2_number,
      &     rho_dust, nuiceco2_sed, nuiceco2_ref,
-     &     rho_ice_co2,r3n_q
-      USE meteoriticflux_mod, ONLY:meteo_flux_mass,meteo_flux_number
-     &     ,meteo_alt
+     &     rho_ice_co2,r3n_q,
+     &     meteo_flux_mass,meteo_flux_number,
+     &     meteo_alt
 
       IMPLICIT NONE
@@ -189 +189 @@
 c         write(*,*) "meteo_lvl=",meteo_lvl
          pq(ig,meteo_lvl,igcm_dust_mass)=pq(ig,meteo_lvl,igcm_dust_mass)
-     &        +meteo_flux_mass
+     &        +dble(meteo_flux_mass)
          pq(ig,meteo_lvl,igcm_dust_number)=
-     &        pq(ig,meteo_lvl,igcm_dust_number)+meteo_flux_number
+     &        pq(ig,meteo_lvl,igcm_dust_number)
+     &        +dble(meteo_flux_number)
       enddo
 

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

@@ -36 +36 @@
       USE ioipsl_getincom, only : getin
       use tracer_mod, only : nuice_sed, ccn_factor, nuiceco2_sed,
-     &                       nuice_ref,nuiceco2_ref
+     &                       nuice_ref,nuiceco2_ref,
+     &                       meteo_flux_mass,
+     &                       meteo_flux_number,meteo_alt
       use surfdat_h, only: albedo_h2o_ice, inert_h2o_ice,
      &                     frost_albedo_threshold
@@ -44 +46 @@
       use dimradmars_mod, only: naerkind, name_iaer,
      &                      ini_scatterers,tauvis
-      USE meteoriticflux_mod !meteo_flux_mass,meteo_flux_number,alt_meteo
 
       IMPLICIT NONE
@@ -502 +503 @@
         write(*,*)"the contact parameter is used instead;"
 
+        !JAud Meteoritic flux of dust : number, mass and altitude
+        !Jaud dust tracers are incremented by thoses values in co2cloud.F
+        !Jaud Thus only apply if co2clouds=.true. in callphys.def
+        write(*,*) "mass mixing ratio for meteoritic dust?"
+        meteo_flux_mass=0.
+        call getin("meteo_flux_mass",meteo_flux_mass)
+        write(*,*) "number density for meteoritic dust?"
+        meteo_flux_number=0.
+        call getin("meteo_flux_number",meteo_flux_number)
+        write(*,*) "altitude of injection?"
+        meteo_alt=5.
+        call getin("meteo_alt",meteo_alt)
+        WRITE(*,*) ""
+        WRITE(*,*) "meteoritic flux of dust"
+        WRITE(*,*) "dust mass = ",meteo_flux_mass
+        WRITE(*,*) "dust number = ",meteo_flux_number
+        WRITE(*,*) "at altitude = ",meteo_alt
+
 ! microphys
          write(*,*)"Microphysical scheme for water-ice clouds?"
@@ -712 +731 @@
          write(*,*) " euveff = ", euveff
 
-        !Meteoritic flux of dust : number, mass and altitude
-        !dust tracers are incremented by thoses values in co2cloud.F
-        ! Thus only apply if co2clouds=.true. in callphys.def
-        meteo_flux_mass=0.
-        call getin("meteo_flux_mass",meteo_flux_mass)
-        meteo_flux_number=0.
-        call getin("meteo_flux_number",meteo_flux_number)
-        meteo_alt=5.
-        call getin("meteo_alt",meteo_alt)
-        WRITE(*,*) ""
-        WRITE(*,*) "meteoritic flux of dust"
-        WRITE(*,*) "dust mass = ",meteo_flux_mass
-        WRITE(*,*) "dust number = ",meteo_flux_number
-        WRITE(*,*) "at altitude = ",meteo_alt
-         
 
          if (.not.callthermos) then

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

@@ -25 +25 @@
 
       real,save :: ccn_factor  ! ratio of nuclei for water ice particles
+
+      real,save :: meteo_flux_mass   ! meteoritic flux of dust - mmr
+      real,save :: meteo_flux_number ! meteoritic flux of dust - nd
+      integer,save :: meteo_alt
 
       INTEGER,ALLOCATABLE,SAVE :: nqdust(:) ! to store the indexes of dust tracers (cf aeropacity)