Changeset 3026 for trunk/LMDZ.MARS/libf

Timestamp:

Aug 9, 2023, 11:56:36 AM (17 months ago)

Author:

jbclement

Message:

Mars PCM/PEM 1D:
Small fixes to be able to run the Mars PCM 1D without "water" + Improvements/addition of scripts in deftank/pem to run the PEM 1D model according to Laskar orbital parameters.
JBC

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• dyn1d/read_profile_mod.F90 (modified) (3 diffs)
• dyn1d/testphys1d.F (modified) (6 diffs)
• initracer.F (modified) (1 diff)
• physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/read_profile_mod.F90

@@ -61 +61 @@
 !--------
   integer :: &
-     iq,             & ! loop over nb_tracer
-     ilayer,         & ! loop over nb_layer
-     ierr,           & ! open file iostat
-     indice_h2o_vap, & ! indice of h2o_vap tracer 
-     indice_h2o_ice, & ! indice of h2o_ice tracer
-     indice_hdo_vap, & ! indice of hdo_vap tracer
-     indice_hdo_ice    ! indice of hdo_ice tracer
+     iq,                 & ! loop over nb_tracer
+     ilayer,             & ! loop over nb_layer
+     ierr,               & ! open file iostat
+     indice_h2o_vap = 0, & ! indice of h2o_vap tracer 
+     indice_h2o_ice = 0, & ! indice of h2o_ice tracer
+     indice_hdo_vap = 0, & ! indice of hdo_vap tracer
+     indice_hdo_ice = 0    ! indice of hdo_ice tracer
 
   character(len=80), dimension(nb_tracer) :: &
@@ -148 +148 @@
 !    the main isotopologue profile is already read before minors isotopologues
 !---------------------------------------------------------------------------------------------------------------------!
-  if (hdo_vap.eqv..true. .and. indice_h2o_vap.ne.0) then
+  if (hdo_vap .and. indice_h2o_vap /= 0) then
     do ilayer = 1, nb_layer
       q(ilayer, indice_hdo_vap) = q(ilayer, indice_h2o_vap)*2*155.76e-6*5
@@ -154 +154 @@
   end if
 
-  if (hdo_ice.eqv..true. .and. indice_h2o_ice.ne.0) then
+  if (hdo_ice .and. indice_h2o_ice /= 0) then
     qsurf(indice_hdo_ice) = qsurf(indice_h2o_ice) * 2*155.76e-6*5
     do ilayer = 1, nb_layer

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -815 +815 @@
       ! Adding an option to force atmospheric water values JN
       atm_wat_profile = -1. ! Default: free atm wat profile
+      if (water) then
       print *,'Force atmospheric water vapor profile?'
       call getin("atm_wat_profile",atm_wat_profile)
@@ -830 +831 @@
         stop
       endif
+      endif
 
 ! Check if the atmospheric water profile relaxation is specified
@@ -835 +837 @@
       ! Adding an option to relax atmospheric water values JBC
       atm_wat_tau = -1. ! Default: no time relaxation
+      if (water) then
       print*, 'Relax atmospheric water vapor profile?'
       call getin("atm_wat_tau",atm_wat_tau)
@@ -850 +853 @@
        stop
         endif
+      endif
       endif
 
@@ -908 +912 @@
 !       Added "atm_wat_profile" flag (JN + JBC)
 !       ---------------------------------------
+      if (water) then
         call watersat(nlayer,temp,play,zqsat)
         if (0. <= atm_wat_profile .and. atm_wat_profile <= 1.) then
@@ -922 +927 @@
           endif
         endif
+      endif
 
 !      write(*,*) "testphys1d avant q", q(1,:)

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

@@ -463 +463 @@
         write(*,*) "initracer: found only ",count," tracers"
         write(*,*) "               expected ",nq
-        do iq=1,count
-          write(*,*)'      ',iq,' ',trim(noms(iq))
-        enddo
         call abort_physic("initracer","tracer mismatch",1)
       else

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

@@ -2633 +2633 @@
 c        -------------------------------------------------------------------
 
-
+       if (water) then
          do ig=1,ngrid
-           if(mu0(ig).le.0.01) then 
+           if(mu0(ig).le.0.01) then
             fluxsurf_dir_dn_sw(ig) = 0.
-           else 
+           else
             fluxsurf_dir_dn_sw(ig) = flux_1AU/dist_sol/dist_sol*mu0(ig)*
      &                    exp(-(tau(ig,iaer_dust_doubleq)+
@@ -2643 +2643 @@
            endif
          enddo
+       endif
 
            ! Density-scaled opacities