Changeset 2162

Timestamp:

Sep 24, 2019, 7:36:09 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Some code cleanup (and preparing next steps):

• Turn calchim into a module and make tendencies module variables in calchim_mod and watercloud_mod
• Externalize in "physiq" the computation of solar zenithal angle (it should be computed at every physics timestep, regardless of iradia)

AB+EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/aeronomars/calchim_mod.F90 (moved) (moved from trunk/LMDZ.MARS/libf/aeronomars/calchim.F90) (4 diffs)
• libf/phymars/phys_state_var_init_mod.F90 (modified) (2 diffs)
• libf/phymars/physiq_mod.F (modified) (3 diffs)
• libf/phymars/watercloud_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/README

@@ -2745 +2745 @@
 == 24/09/2019 == EM
 - Reactivate output of density scaled opacity
+
+== 24/09/2019 == AB+EM
+Some code cleanup (and preparing next steps): 
+- Turn calchim into a module and make tendencies module variables
+  in calchim_mod and watercloud_mod
+- Externalize in "physiq" the computation of solar zenithal angle
+  (it should be computed at every physics timestep, regardless of iradia)

trunk/LMDZ.MARS/libf/aeronomars/calchim_mod.F90

@@ +1 @@
+MODULE calchim_mod
+
+  IMPLICIT NONE
+
+  REAL,SAVE,ALLOCATABLE :: zdqchim(:,:,:) ! Tendancy on pq due to photochemistry
+  REAL,SAVE,ALLOCATABLE :: zdqschim(:,:) ! Tendancy on qsurf due to photochemistry
+
+  CONTAINS
+
       subroutine calchim(ngrid,nlayer,nq,                           &
                          ptimestep,pplay,pplev,pt,pdt,dist_sol,mu0,         &
@@ -15 +24 @@
 
       use conc_mod, only: mmean ! mean molecular mass of the atmosphere
-      use comcstfi_h
-      use photolysis_mod
+      use comcstfi_h, only: pi
+      use photolysis_mod, only: jonline, init_photolysis
       use iono_h, only: temp_elect
 
@@ -69 +78 @@
 !=======================================================================
 
-#include "callkeys.h"
+include "callkeys.h"
 
 !     input:
@@ -637 +646 @@
       end if ! of if (output)
 
-      return
-      end
+      end subroutine calchim
+
+
+    subroutine ini_calchim_mod(ngrid,nlayer,nq)
+  
+      implicit none
+  
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of tracers
+
+      allocate(zdqchim(ngrid,nlayer,nq))
+      zdqchim(:,:,:)=0
+      allocate(zdqschim(ngrid,nq))
+      zdqschim(:,:)=0
+
+    end subroutine ini_calchim_mod
+
+
+    subroutine end_calchim_mod
+
+      implicit none
+
+      if (allocated(zdqchim))      deallocate(zdqchim)
+      if (allocated(zdqschim))      deallocate(zdqschim)
+
+    end subroutine end_calchim_mod
+
+END MODULE calchim_mod 
+

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

@@ -49 +49 @@
       use rocketduststorm_mod, only: ini_rocketduststorm_mod, &
                                      end_rocketduststorm_mod
+      use calchim_mod, only: ini_calchim_mod,end_calchim_mod
+      use watercloud_mod, only: ini_watercloud_mod, &
+                                end_watercloud_mod
 
       IMPLICIT NONE
@@ -118 +121 @@
       call ini_rocketduststorm_mod(ngrid)
       
+      ! allocate arrays in "calchim_mod" (aeronomars)
+      call end_calchim_mod
+      call ini_calchim_mod(ngrid,nlayer,nq)
+
+      ! allocate arrays in "watercloud_mod"
+      call end_watercloud_mod
+      call ini_watercloud_mod(ngrid,nlayer,nq)
+
       END SUBROUTINE phys_state_var_init
 

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

@@ -14 +14 @@
      $            ,pdu,pdv,pdt,pdq,pdpsrf)
 
-      use watercloud_mod, only: watercloud
+      use watercloud_mod, only: watercloud, zdqcloud, zdqscloud
+      use calchim_mod, only: calchim, zdqchim, zdqschim
       use watersat_mod, only: watersat
       use co2condens_mod, only: co2condens
@@ -308 +309 @@
       REAL zdqadj(ngrid,nlayer,nq)
       REAL zdqc(ngrid,nlayer,nq)
-      REAL zdqcloud(ngrid,nlayer,nq),zdqcloudco2(ngrid,nlayer,nq)
-      REAL zdqscloud(ngrid,nq)
-      REAL zdqchim(ngrid,nlayer,nq)
-      REAL zdqschim(ngrid,nq)
+      REAL zdqcloudco2(ngrid,nlayer,nq)
 
       REAL zdteuv(ngrid,nlayer)    ! (K/s)
@@ -705 +703 @@
 
       IF (callrad) THEN
+
+c       Local Solar zenith angle
+c       ~~~~~~~~~~~~~~~~~~~~~~~~
+        CALL orbite(zls,dist_sol,declin)
+
+        IF (diurnal) THEN
+            ztim1=SIN(declin)
+            ztim2=COS(declin)*COS(2.*pi*(zday-.5))
+            ztim3=-COS(declin)*SIN(2.*pi*(zday-.5))
+
+            CALL solang(ngrid,sinlon,coslon,sinlat,coslat,
+     &                  ztim1,ztim2,ztim3, mu0,fract)
+
+        ELSE
+            CALL mucorr(ngrid,declin,latitude,mu0,fract,10000.,rad)
+        ENDIF ! of IF (diurnal)
+
          IF( MOD(icount-1,iradia).EQ.0) THEN
-
-c          Local Solar zenith angle
-c          ~~~~~~~~~~~~~~~~~~~~~~~~
-           CALL orbite(zls,dist_sol,declin)
-
-           IF(diurnal) THEN
-               ztim1=SIN(declin)
-               ztim2=COS(declin)*COS(2.*pi*(zday-.5))
-               ztim3=-COS(declin)*SIN(2.*pi*(zday-.5))
-
-               CALL solang(ngrid,sinlon,coslon,sinlat,coslat,
-     s         ztim1,ztim2,ztim3, mu0,fract)
-
-           ELSE
-               CALL mucorr(ngrid,declin,latitude,mu0,fract,10000.,rad)
-           ENDIF
 
 c          NLTE cooling from CO2 emission

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

@@ -2 +2 @@
 
        IMPLICIT NONE
+
+       REAL,SAVE,ALLOCATABLE :: zdqcloud(:,:,:) ! tendencies on pq due to condensation of H2O(kg/kg.s-1)
+       REAL,SAVE,ALLOCATABLE :: zdqscloud(:,:) ! tendencies on qsurf (calculated only by calchim but declared here)
 
        CONTAINS
@@ -641 +644 @@
       END SUBROUTINE watercloud
       
+      subroutine ini_watercloud_mod(ngrid,nlayer,nq)
+        implicit none
+  
+        integer,intent(in) :: ngrid ! number of atmospheric columns
+        integer,intent(in) :: nlayer ! number of atmospheric layers
+        integer,intent(in) :: nq ! number of tracers
+
+        allocate(zdqcloud(ngrid,nlayer,nq))
+        zdqcloud(:,:,:)=0
+        allocate(zdqscloud(ngrid,nq))
+        zdqscloud(:,:)=0
+
+       end subroutine ini_watercloud_mod
+
+
+       subroutine end_watercloud_mod
+         implicit none
+
+         if (allocated(zdqcloud))      deallocate(zdqcloud)
+         if (allocated(zdqscloud))      deallocate(zdqscloud)
+
+       end subroutine end_watercloud_mod
+
       END MODULE watercloud_mod