Changeset 3026

Timestamp:

Aug 9, 2023, 11:56:36 AM (9 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

Files:

• LMDZ.COMMON/libf/evolution/orbit_param_criterion_mod.F90 (modified) (1 diff)
• LMDZ.MARS/changelog.txt (modified) (1 diff)
• LMDZ.MARS/deftank/field_def_physics_mars.xml (modified) (2 diffs)
• LMDZ.MARS/deftank/file_def_physics_mars.xml (modified) (4 diffs)
• LMDZ.MARS/deftank/pem/modify_startfi_Ls.sh (added)
• LMDZ.MARS/deftank/pem/modify_startfi_orbit.sh (moved) (moved from trunk/LMDZ.MARS/deftank/pem/modify_startfi.sh) (3 diffs)
• LMDZ.MARS/deftank/pem/run_PEM1D.sh (moved) (moved from trunk/LMDZ.MARS/deftank/pem/run_pem1d_1)
• LMDZ.MARS/libf/phymars/dyn1d/read_profile_mod.F90 (modified) (3 diffs)
• LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F (modified) (6 diffs)
• LMDZ.MARS/libf/phymars/initracer.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (2 diffs)
• LMDZ.MARS/user_manual.pdf (modified) (previous)

trunk/LMDZ.COMMON/libf/evolution/orbit_param_criterion_mod.F90

@@ -78 +78 @@
 
           open(73,file='ob_ex_lsp.asc')
-          do ilask=1,nlask
-            read(73,*) yearlask(ilask),oblask(ilask),      &
-             exlask(ilask),lsplask(ilask)
-            yearlask(ilask)=yearlask(ilask)*1000
-
-            if(yearlask(ilask).GT.Year) then
-                last_ilask=ilask+1
-            endif
-          end do
+          do ilask = 1,nlask
+            read(73,*) yearlask(ilask), oblask(ilask), exlask(ilask), lsplask(ilask)
+            yearlask(ilask) = yearlask(ilask)*1000.
+            if (yearlask(ilask) > Year) last_ilask = ilask + 1
+          enddo
           close(73)
 

trunk/LMDZ.MARS/changelog.txt

@@ -4166 +4166 @@
 Fixed a bug in newstart call to lect_start_archive; missing perenial_co2ice
 argument. Turned lect_start_archive into a module so this cant't happen again.
+
+== 09/08/2023 == JBC
+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.

trunk/LMDZ.MARS/deftank/field_def_physics_mars.xml

@@ -334 +334 @@
                    unit="W.m-2" />
             <field id="tauTES"
+                   long_name="Water ice cloud opacity at TES abs 825 cm-1"
+                   unit="" />
+            <field id="tauTESap"
                    long_name="Water ice cloud opacity at TES abs 825 cm-1"
                    unit="" />
@@ -653 +656 @@
                    long_name="count_micro after microphysics" 
                    unit="integer" />
-            
+
+            <field id="zdqcloud_ice" 
+                   long_name="cloud ice" 
+                   unit="kg.m-2.s-1" />
+            <field id="zdqcloud_vap"
+                   long_name="cloud vap"
+                   unit="kg.m-2.s-1" />
+            <field id="zdqcloud"
+                   long_name="cloud"
+                   unit="kg.m-2.s-1" />
+
             <!-- CO2 condensation parametrization -->
             <field id="co2condens_pdtc" 

trunk/LMDZ.MARS/deftank/file_def_physics_mars.xml

@@ -12 +12 @@
               time_units="days"
               type="one_file"
-              enabled=".true.">
+              enabled=".false.">
                     
             <!-- VARS 0D -->
@@ -37 +37 @@
                 <field field_ref="u" />
                 <field field_ref="v" />
+                <field field_ref="dustq" />
+                <field field_ref="dustN" />
+                <field field_ref="h2o_vap" />
+                <field field_ref="h2o_ice" />
             </field_group>
 
@@ -83 +87 @@
               type="one_file"
               time_units="days"
-              enabled=".false.">
+              enabled=".true.">
                     
             <!-- VARS 0D -->
@@ -112 +116 @@
                 <field field_ref="h2o_layer1" />
                 <field field_ref="co2_layer1" />
+                <field field_ref="fluxsurf_dn_sw" name="ISR" />
+                <field field_ref="fluxtop_lw" name="OLR" />
             </field_group>
 

trunk/LMDZ.MARS/deftank/pem/modify_startfi_orbit.sh

@@ -4 +4 @@
 name_file="startfi.nc"
 
-new_obl=30.
-new_exc=0.
-new_Lsp=250.
-
-year_day=669.
-halfaxe=227.94
+new_obl=30.0286
+new_exc=0.08212066
+new_Lsp=347.443947402
 
 
 # Calculate modified values
+year_day=669.
+halfaxe=227.94
 pi=$(echo "4*a(1)" | bc -l)
-arg=$(echo "0.5*2.*$pi*$new_Lsp/360." | bc -l)
-zx0=$(echo "-2.*-2.0*a(s($arg)/c($arg)*sqrt((1. - $new_exc)/(1. + $new_exc)))" | bc -l)
-if [ $(echo "$zx0 < 0" | bc -l) -eq 1 ]; then
+degrad=$(echo "360./(2.*$pi)" | bc -l)
+tan=$(echo "s(0.5*$new_Lsp/$degrad)/c(0.5*$new_Lsp/$degrad)" | bc -l)
+zx0=$(echo "-2.*a($tan*sqrt((1.-$new_exc)/(1.+$new_exc)))" | bc -l)
+if [ $(echo "$zx0 <= 0" | bc -l) -eq 1 ]; then
   zx0=$(echo "$zx0 + 2.*$pi" | bc -l)
 fi
@@ -24 +24 @@
 # controle(15) = periheli ! min. Sun-Mars distance (Mkm)  ̃206.66
 # controle(16) = aphelie  ! max. SUn-Mars distance (Mkm)  ̃249.22
-# controle(16) = peri_day ! date of perihelion (sols since N. spring)
+# controle(17) = peri_day ! date of perihelion (sols since N. spring)
 # controle(18) = obliquit ! Obliquity of the planet (deg)  ̃23.98
 ncap2 -O -s "controle(17)=$new_obl" \
@@ -34 +34 @@
 # Rename the temporary file back to the original filename
 mv $name_file.temp $name_file
+
+echo New obliquit = $new_obl
+echo New periheli = $(echo "$halfaxe*(1-$new_exc)" | bc -l)
+echo New aphelie = $(echo "$halfaxe*(1+$new_exc)" | bc -l)
+echo New peri_day = $solp

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