Changeset 3443 for trunk

Timestamp:

Sep 27, 2024, 6:23:50 PM (8 weeks ago)

Author:

emillour

Message:

Mars PCM:
Add new molecular diffusion routine moldiff_MPF (modified pass flow scheme)
But for intermetiate testing the legacy moldiff_red routine remains
the default. The moldiff_scheme flag (1: legacy, 2: MPF) can be used
to swich from one scheme to the other.
JYC+EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/aeronomars/moldiff_MPF.F90 (added)
• libf/aeronomars/thermosphere.F (modified) (4 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4699 +4699 @@
 == 20/09/2024 == EM
 Update reference callphys.def.hdo.GCM5 in deftank
+
+== 27/09/2024 == JYC+EM
+Add new molecular diffusion routine moldiff_MPF (modified pass flow scheme)
+But for intermetiate testing the legacy moldiff_red routine remains
+the default. The "moldiff_scheme" flag (1: legacy, 2: MPF) can be used
+to swich from one scheme to the other.

trunk/LMDZ.MARS/libf/aeronomars/thermosphere.F

@@ -3 +3 @@
       IMPLICIT NONE
       
+      integer,save :: moldiff_scheme ! 1:legacy scheme, 2: MPF scheme
+!$OMP THREADPRIVATE(moldiff_scheme)
+
       CONTAINS
       
@@ -12 +15 @@
      $     PhiEscH,PhiEscH2,PhiEscD)
 
-      use moldiff_red_mod, only: moldiff_red
+      use ioipsl_getin_p_mod, only: getin_p
+      use moldiff_red_mod, only: moldiff_red ! old molecular diffusion scheme
+      use moldiff_MPF_mod, only: moldiff_MPF ! new molecular diffusion scheme
       use conc_mod, only: rnew, cpnew
       USE comcstfi_h, only: r, cpp
+      use mod_phys_lmdz_para, only : is_master
       implicit none
 
@@ -45 +51 @@
 
       INTEGER :: l,ig
+      logical,save :: firstcall=.true.
+!$OMP THREADPRIVATE(firstcall)
+      
+      if (firstcall) then
+        ! default scheme for molecular diffusion: legacy
+        moldiff_scheme=1
+        call getin_p("moldiff_scheme",moldiff_scheme)
+        if (is_master) then
+          write(*,*)"thermosphere: moldiff_scheme=",moldiff_scheme
+        endif
+        firstcall=.false.
+      endif ! of if (firstcall)
 
       ! initialize tendencies to zero in all cases
@@ -74 +92 @@
 
       if (callmoldiff) THEN
+       if (moldiff_scheme==1) then
+        ! old "legacy" scheme
         call moldiff_red(ngrid,nlayer,nq,
      &                   pplay,pplev,pt,pdt,pq,pdq,ptimestep,
      &                   zzlay,zdteuv,zdtconduc,zdqmoldiff,
      &                   PhiEscH,PhiEscH2,PhiEscD)
+       else
+        ! new MPF (modified pass flow) scheme
+        call moldiff_MPF(ngrid,nlayer,nq,
+     &                   pplay,pplev,pt,pdt,pq,pdq,ptimestep,
+     &                   zzlay,zdteuv,zdtconduc,zdqmoldiff,
+     &                   PhiEscH,PhiEscH2,PhiEscD)
+       endif ! of if (moldiff_scheme==1)
       endif