Changeset 3277 for trunk

Timestamp:

Mar 20, 2024, 4:29:22 PM (8 months ago)

Author:

jleconte

Message:

flag moistadjustment_generic

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• callkeys_mod.F90 (modified) (1 diff)
• inifis_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/callkeys_mod.F90

@@ -50 +50 @@
       logical,save :: virtual_correction
 !$OMP THREADPRIVATE(varactive,varfixed,sedimentation,generic_condensation,generic_rain,virtual_correction)
-      logical,save :: water ,watercond, waterrain, moistadjustment
-!$OMP THREADPRIVATE(water, watercond, waterrain, moistadjustment)
+      logical,save :: water ,watercond, waterrain, moistadjustment, moistadjustment_generic
+!$OMP THREADPRIVATE(water, watercond, waterrain, moistadjustment, moistadjustment_generic)
       logical,save :: aeroco2, aeroh2o, aeroh2so4, aeroback2lay
 !$OMP THREADPRIVATE(aeroco2, aeroh2o, aeroh2so4, aeroback2lay)

trunk/LMDZ.GENERIC/libf/phystd/inifis_mod.F90

@@ -1020 +1020 @@
      if (is_master) write(*,*)trim(rname)//": generic_condensation = ",generic_condensation
      
-     if (is_master) write(*,*)trim(rname)//": Generic Condensation of tracers ?"
+     if (is_master) write(*,*)trim(rname)//": Generic rain of tracers ?"
      generic_rain=.false. !default value 
      call getin_p("generic_rain",generic_rain)
      if (is_master) write(*,*)trim(rname)//": generic_rain = ",generic_rain
+
+     if (is_master) write(*,*)trim(rname)//": Include moist adjustement for GCS ?"
+     moistadjustment_generic=.false. ! default value
+     call getin_p("moistadjustment_generic",moistadjustment_generic)
+     if (is_master) write(*,*)trim(rname)//": moistadjustment_generic = ", moistadjustment_generic
      
      if (is_master) write(*,*)trim(rname)//": Virtual correction ?"

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -70 +70 @@
                               tracer, UseTurbDiff, water, watercond, &
                               waterrain, generic_rain, global1d, szangle, &
-                              moistadjustment, varspec, varspec_data, nvarlayer
+                              moistadjustment, moistadjustment_generic, varspec, varspec_data, nvarlayer
       use generic_tracer_index_mod, only: generic_tracer_index
       use nonoro_gwd_ran_mod, only: nonoro_gwd_ran
@@ -1674 +1674 @@
 
 
-  ! -------------------------
-  !   VI.3. Aerosol particles
-  ! -------------------------
-
-         !Generic Condensation
+  ! ------------------------------------------
+  !   VI.3.a Generic Condensable Species (GCS)
+  ! ------------------------------------------
+
          if (generic_condensation) then
+            if ((.not.water).and.(.not.calltherm).and.moistadjustment_generic) then
+               write(*,*) "moist adjustment for GCS"
+               dqmoist(1:ngrid,1:nlayer,1:nq)=0.
+               dtmoist(1:ngrid,1:nlayer)=0.
+               
+               ! Moist Convective Adjustment.
+               ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               call moistadj_generic(ngrid,nlayer,nq,pt,pq,pdq,pplev,pplay,dtmoist,dqmoist,ptimestep,rneb_man)
+            
+               pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq)     &
+                                                  + dqmoist(1:ngrid,1:nlayer,1:nq)
+               pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq)     &
+                                                  + dqmoist(1:ngrid,1:nlayer,1:nq)
+               pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtmoist(1:ngrid,1:nlayer)
+
+               ! Test energy conservation.
+               if(enertest)then
+                  call planetwide_sumval(cpp*massarea(:,:)*dtmoist(:,:)/totarea_planet,dEtot)
+                  call planetwide_maxval(dtmoist(:,:),dtmoist_max)
+                  call planetwide_minval(dtmoist(:,:),dtmoist_min)
+                  madjdEz(:,:)=cpp*mass(:,:)*dtmoist(:,:)
+                  
+                  do ig=1,ngrid
+                     madjdE(ig) = cpp*SUM(mass(:,:)*dtmoist(:,:))
+                  enddo
+                  
+                  if (is_master) then
+                     print*,'In moistadj atmospheric energy change   =',dEtot,' W m-2'
+                     print*,'In moistadj MAX atmospheric energy change   =',dtmoist_max*ptimestep,'K/step'
+                     print*,'In moistadj MIN atmospheric energy change   =',dtmoist_min*ptimestep,'K/step'
+                  endif
+
+                  ! igcm_generic_vap & igcm_generic_ice are not declared below
+                  ! call planetwide_sumval(massarea(:,:)*dqmoist(:,:,igcm_generic_vap)*ptimestep/totarea_planet+        &
+                  !                        massarea(:,:)*dqmoist(:,:,igcm_generic_ice)*ptimestep/totarea_planet,dWtot)
+                  ! if (is_master) print*,'In moistadj atmospheric water change    =',dWtot,' kg m-2'
+               
+               endif ! end of 'enertest'
+            else
+               ! rneb_man, dqmoist are output of moistadj, but used later on
+               ! so set them to zero if moistadj is not called
+               rneb_man(:,:)=0
+               dqmoist(:,:,:)=0
+            endif ! end of '(.not.calltherm).and.moistadjustment_generic'
+
             call condensation_generic(ngrid,nlayer,nq,ptimestep,pplev,pplay,   &
                                           pt,pq,pdt,pdq,dt_generic_condensation, &
@@ -1794 +1838 @@
          endif !generic_rain
 
-         ! Sedimentation.
+  ! -------------------------
+  !   VI.3.b. Sedimentation.
+  ! -------------------------
          if (sedimentation) then