Changeset 1904 for trunk/LMDZ.TITAN/libf/phytitan

Timestamp:

Feb 25, 2018, 7:44:55 PM (7 years ago)

Author:

jvatant

Message:

Fixed 2 critical bugs.
+ One about rat_mmol (* instead of /)
+ One about zonal means (or not) arrays sent in chemistry and mufi
In any case zonal means seems to be responsible for crashes of chem and mufi !
Stop using them until further informations (for mufi, no problem, full 3D is quick)
--JVO

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• calmufi.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (7 diffs)

trunk/LMDZ.TITAN/libf/phytitan/calmufi.F90

@@ -103 +103 @@
       do i=1,nices
         m3i(:,nices) = pq(ilon,:,6+i) * int2ext(:)
-        gazs(:,i)    = pq(ilon,:,ices_indx(i)) * rat_mmol(ices_indx(i)) ! For gazs we work on the full tracer array !!
+        gazs(:,i)    = pq(ilon,:,ices_indx(i)) / rat_mmol(ices_indx(i)) ! For gazs we work on the full tracer array !!
         ! We use the molar mass ratio from GCM in case there is discrepancy with the mm one
       enddo
@@ -147 +147 @@
       do i=1,nices
         zdq(ilon,:,6+i) = dm3i(:,nices) / int2ext(:)
-        zdq(ilon,:,ices_indx(i)) = dgazs(:,i)  / rat_mmol(ices_indx(i)) ! For gazs we work on the full tracer array !!
+        zdq(ilon,:,ices_indx(i)) = dgazs(:,i) * rat_mmol(ices_indx(i)) ! For gazs we work on the full tracer array !!
         ! We use the molar mass ratio from GCM in case there is discrepancy with the mm one
       enddo

trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90

@@ -38 +38 @@
       use logic_mod, only: moyzon_ch, moyzon_mu
       use moyzon_mod, only: tmoy, playmoy, zphibar, zphisbar, zplevbar, &
-                            zplaybar, zzlevbar, zzlaybar, ztfibar
+                            zplaybar, zzlevbar, zzlaybar, ztfibar, zqfibar
       use callkeys_mod
       use vertical_layers_mod, only: presnivs, pseudoalt
@@ -624 +624 @@
                           ptimestep,pday+nday,time_phys,cell_area,          &
                           albedo_bareground,inertiedat,zmea,zstd,zsig,zgam,zthe)
-         
-            ! Sanity check for microphysics - useless in 1D
-            if ( ((.not.moyzon_mu).and.(callmufi)) ) then
-               print *, "moyzon_mu=",moyzon_mu," and callmufi=",callmufi
-               print *, "Please activate zonal mean to run microphysics (for now) !"
-               stop
-            endif
-
-            ! Sanity check for chemistry - useless in 1D
-            if ( (.not.moyzon_ch) .and. (callchim) ) then
-               print *, "moyzon_ch=",moyzon_ch," and callchim=",callchim
-               print *, "Please activate zonal mean to run chemistry !"
-               stop
-            endif
-
-        endif ! of ngrid.ne.1
+         endif
          
          ! XIOS outputs
@@ -731 +716 @@
       if (moyzon_ch .or. moyzon_mu) then
          
+         print *, "------------------------------ </CRITICAL ALERT> -------------------------------"
+         print *, "WARNING : YOU ARE USING ZONAL MEANS THAT SEEM TO LEAD TO CRASHES (-infinity) ..."
+         print *, "------------------------------ <CRITICAL ALERT/> -------------------------------"
+
          zzlaybar(1,:)=(zphibar(1,:)+zphisbar(1))/g
          ! SI ON TIENT COMPTE DE LA VARIATION DE G AVEC L'ALTITUDE:
@@ -1078 +1067 @@
          if (callchim) then
 
-            do iq = 1,nkim
-               ychim(:,:,iq) = pq(:,:,iq+nmicro) * rat_mmol(iq+nmicro) ! convert to molar fraction
-            enddo
+            ! Convert to molar fraction
+            if (moyzon_ch) then
+              do iq = 1,nkim
+                 ychim(:,:,iq) = zqfibar(:,:,iq+nmicro) / rat_mmol(iq+nmicro)
+              enddo
+            else 
+              do iq = 1,nkim
+                 ychim(:,:,iq) = pq(:,:,iq+nmicro) / rat_mmol(iq+nmicro)
+              enddo
+            endif
 
             ! Condensation tendency after the transport
@@ -1099 +1095 @@
                print *, "We enter in the chemistry ..."
 
-               if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
-                 call calchim(ngrid,ychim,declin,zls,ctimestep, &
-                           pt,pplay,pplev,zzlay,zzlev,dycchi)
-               else
-                 call calchim(ngrid,ychim,declin,zls,ctimestep, &
-                           ztfibar,zplaybar,zplevbar,zzlaybar,zzlevbar,dycchi)
+               if (moyzon_ch.and.(ngrid.ne.1)) then ! 2D zonally averaged chemistry !! SEEMS TO CRASH DON'T USE IT !!
+                 call calchim(ngrid,ychim,declin,zls,ctimestep,ztfibar,zphibar,  &
+                              zplaybar,zplevbar,zzlaybar,zzlevbar,dycchi)
+               else ! 3D chemistry (or 1D run)
+                 call calchim(ngrid,ychim,declin,zls,ctimestep,pt,pphi,  &
+                              pplay,pplev,zzlay,zzlev,dycchi)
                endif
 
@@ -1115 +1111 @@
             ! We convert tendencies to mass mixing ratio
             do iq=1,nkim
-               zdqchi(:,:,iq+nmicro)  = dycchi(:,:,iq)  / rat_mmol(iq+nmicro)
-               zdqcond(:,:,iq+nmicro) = dyccond(:,:,iq+nmicro) / rat_mmol(iq+nmicro)
+               zdqchi(:,:,iq+nmicro)  = dycchi(:,:,iq) * rat_mmol(iq+nmicro)
+               zdqcond(:,:,iq+nmicro) = dyccond(:,:,iq+nmicro) * rat_mmol(iq+nmicro)
             enddo
 
@@ -1131 +1127 @@
          if (callmufi) then
 #ifdef USE_QTEST
-               if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
-                  call calmufi(ptimestep,pplev,zzlev,pplay,zzlay,pt,tpq,zdqmufi)
-               else
-                  call calmufi(ptimestep,zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,tpq,zdqmufi)
-               endif
-               tpq(:,:,:) = tpq(:,:,:) + zdqmufi(1:ngrid,1:nlayer,1:nq)*ptimestep ! only manipulation of tpq->*ptimesep here
+               call calmufi(ptimestep,pplev,zzlev,pplay,zzlay,pt,tpq,zdqmufi)
+               tpq(:,:,:) = tpq(:,:,:) + zdqmufi(:,:,:)*ptimestep ! only manipulation of tpq->*ptimesep here
 #else
             ! Inside this routine we will split 2D->1D, intensive->extensive and separate different types of tracers
             ! Should be put in phytrac
 
-               if (ngrid.eq.1) then ! We obviously don't have access to (and don't need) zonal means in 1D
+               if (moyzon_mu.and.(ngrid.ne.1)) then ! 2D zonally averaged microphysics !! SEEMS TO CRASH DON'T USE IT !!
+                  call calmufi(ptimestep,zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,zqfibar,zdqmufi)
+               else ! 3D microphysics (or 1D run)
                   call calmufi(ptimestep,pplev,zzlev,pplay,zzlay,pt,pq,zdqmufi)
-               else
-                  call calmufi(ptimestep,zplevbar,zzlevbar,zplaybar,zzlaybar,ztfibar,pq,zdqmufi)
                endif