Changeset 2007

Timestamp:

Oct 18, 2018, 9:59:39 AM (6 years ago)

Author:

flefevre

Message:

Suppression de l'ancien code photochimique (euler-backward)

Location:

trunk/LMDZ.MARS/libf

Files:

• aeronomars/calchim.F90 (moved) (moved from trunk/LMDZ.MARS/libf/aeronomars/calchim_asis.F90) (2 diffs)
• aeronomars/photochemistry.F (deleted)
• aeronomars/photochemistry.F90 (moved) (moved from trunk/LMDZ.MARS/libf/aeronomars/photochemistry_asis.F90) (5 diffs)
• aeronomars/photolysis.F90 (moved) (moved from trunk/LMDZ.MARS/libf/aeronomars/photolysis_asis.F90) (1 diff)
• phymars/physiq_mod.F (modified) (2 diffs)

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

@@ -1 @@
-      subroutine calchim_asis(ngrid,nlayer,nq,                              &
+      subroutine calchim(ngrid,nlayer,nq,                                   &
                          ptimestep,pplay,pplev,pt,pdt,dist_sol,mu0,         &
                          zzlev,zzlay,zday,pq,pdq,dqchim,dqschim,dqcloud,    &
@@ -658 +658 @@
          if (photochem) then
 
-            call photochemistry_asis(nlayer,nq,                       &
+            call photochemistry(nlayer,nq,                            &
                                 ig,lswitch,zycol,szacol,ptimestep,    &
                                 zpress,ztemp,zdens,zmmean,dist_sol,   &

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

@@ -13 +13 @@
 !*****************************************************************
 
-subroutine photochemistry_asis(nlayer, nq,                            &
+subroutine photochemistry(nlayer, nq,                                 &
                           ig, lswitch, zycol, sza, ptimestep, press,  &
                           temp, dens, zmmean, dist_sol, surfdust1d,   &
@@ -141 +141 @@
 !===================================================================
 
-call photolysis_asis(nlayer, lswitch, press, temp, sza, tau, zmmean, dist_sol, & 
-                     rm(:,i_co2), rm(:,i_o3), v_phot)
+call photolysis(nlayer, lswitch, press, temp, sza, tau, zmmean, dist_sol, & 
+                rm(:,i_co2), rm(:,i_o3), v_phot)
 
 ! save o3 photolysis for output
@@ -226 +226 @@
    call dgesv(nesp,1,mat,nesp,indx,cnew,nesp,code)
 #else
-   write(*,*) "photochemistry_asis error, missing LAPACK routine dgesv"
+   write(*,*) "photochemistry error, missing LAPACK routine dgesv"
    stop
 #endif
@@ -345 +345 @@
       call dgesv(nesp,1,mat,nesp,indx,cnew,nesp,code)
 #else
-   write(*,*) "photochemistry_asis error, missing LAPACK routine dgesv"
+   write(*,*) "photochemistry error, missing LAPACK routine dgesv"
    stop
 #endif
@@ -1850 +1850 @@
       end subroutine chimtogcm
 
-end subroutine photochemistry_asis
-
+end subroutine photochemistry
+

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

@@ -1 +1 @@
 !==========================================================================
 
-      subroutine photolysis_asis(nlayer,                              &
-                                 lswitch, press, temp, sza, tauref,   &
-                                 zmmean, dist_sol, rmco2, rmo3, v_phot)
+      subroutine photolysis(nlayer,                              &
+                            lswitch, press, temp, sza, tauref,   &
+                            zmmean, dist_sol, rmco2, rmo3, v_phot)
 
 !==========================================================================

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

@@ -241 +241 @@
       real zcondicea_co2microp(ngrid,nlayer)
 c     Variables used by the photochemistry
-      logical :: asis             ! true  : adaptative semi-implicit symmetric (asis) chemical solver
-                                  ! false : euler backward chemical solver
       REAL surfdust(ngrid,nlayer) ! dust surface area (m2/m3, if photochemistry)
       REAL surfice(ngrid,nlayer)  !  ice surface area (m2/m3, if photochemistry)
@@ -1588 +1586 @@
      $                       surfdust, surfice)
 !           call photochemistry
-!           asis = .false.  euler-backward scheme 
-!           asis = .true.   asis scheme 
-
-            asis = .true.
-
-            if (asis) then
-            call calchim_asis(ngrid,nlayer,nq,
-     &                   ptimestep,zplay,zplev,pt,pdt,dist_sol,mu0,
-     $                   zzlev,zzlay,zday,pq,pdq,zdqchim,zdqschim,
-     $                   zdqcloud,zdqscloud,tauref,co2ice,
-     $                   pu,pdu,pv,pdv,surfdust,surfice)
-            else
             call calchim(ngrid,nlayer,nq,
      &                   ptimestep,zplay,zplev,pt,pdt,dist_sol,mu0,