Changeset 2374 for trunk

Timestamp:

Jun 12, 2020, 8:51:16 AM (4 years ago)

Author:

emillour

Message:

Mars GCM:
Minor fix to r2362 (addition of CO2 microphysics): make CO2 conservation
tests only if CO2 microphysics is on.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (3 diffs)

trunk/LMDZ.MARS/README

@@ -3100 +3100 @@
 New tool to convert a startarchive from LMDZ (lonlat) into start.nc and startfi.nc adapted to DYNAMICO
 Still under development: be careful when using it
+
+== 12/06/2020 == EM
+Minor fix to r2362 (addition of CO2 microphysics): make CO2 conservation
+tests only if CO2 microphysics is on.

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

@@ -817 +817 @@
       enddo
 
-      ! calculates the amount of co2 at the beginning of physics
-      co2totA = 0.
-      do ig=1,ngrid
-        do l=1,nlayer
-           co2totA = co2totA + (zplev(ig,l)-zplev(ig,l+1))/g*
-     &           (pq(ig,l,igcm_co2)+pq(ig,l,igcm_co2_ice)
-     &      +(pdq(ig,l,igcm_co2)+pdq(ig,l,igcm_co2_ice))*ptimestep)
+      ! test for co2 conservation with co2 microphysics
+      if (igcm_co2_ice.ne.0) then
+        ! calculates the amount of co2 at the beginning of physics
+        co2totA = 0.
+        do ig=1,ngrid
+          do l=1,nlayer
+             co2totA = co2totA + (zplev(ig,l)-zplev(ig,l+1))/g*
+     &             (pq(ig,l,igcm_co2)+pq(ig,l,igcm_co2_ice)
+     &        +(pdq(ig,l,igcm_co2)+pdq(ig,l,igcm_co2_ice))*ptimestep)
+          end do
+          co2totA = co2totA + co2ice(ig)
         end do
-        co2totA = co2totA + co2ice(ig)
-      end do
+      endif ! of if (igcm_co2_ice.ne.0)
 c-----------------------------------------------------------------------
 c    2. Compute radiative tendencies :
@@ -2143 +2146 @@
        ENDDO
 
-      ! Total mass of co2
-      mtotco2 = 0.
-      icetotco2 = 0.
-      vaptotco2 = 0.
-      do ig=1,ngrid
-        do l=1,nlayer
-          vaptotco2 = vaptotco2 + zq(ig,l,igcm_co2) *
+      ! test for co2 conservation with co2 microphysics
+      if (igcm_co2_ice.ne.0) then
+        ! Total mass of co2
+        mtotco2 = 0.
+        icetotco2 = 0.
+        vaptotco2 = 0.
+        do ig=1,ngrid
+          do l=1,nlayer
+            vaptotco2 = vaptotco2 + zq(ig,l,igcm_co2) *
      &                    (zplev(ig,l) - zplev(ig,l+1)) / g
-          icetotco2 = icetotco2 + zq(ig,l,igcm_co2_ice) *
+            icetotco2 = icetotco2 + zq(ig,l,igcm_co2_ice) *
      &                    (zplev(ig,l) - zplev(ig,l+1)) / g
+          end do
+          mtotco2 = mtotco2 + co2ice(ig)
         end do
-        mtotco2 = mtotco2 + co2ice(ig)
-      end do
-      mtotco2 = mtotco2 + vaptotco2 + icetotco2
+        mtotco2 = mtotco2 + vaptotco2 + icetotco2
+      endif ! of if (igcm_co2_ice.ne.0)
 
 c    Compute surface stress : (NB: z0 is a common in surfdat.h)
@@ -3766 +3772 @@
       END IF       ! if(ngrid.ne.1)
 
-      co2totB = 0. ! added by C.M.
-      do ig=1,ngrid
-        do l=1,nlayer
-          co2totB = co2totB + (zplev(ig,l)-zplev(ig,l+1))/g*
-     &           (pq(ig,l,igcm_co2)+pq(ig,l,igcm_co2_ice)
-     &      +(pdq(ig,l,igcm_co2)+pdq(ig,l,igcm_co2_ice))*ptimestep)
+! test for co2 conservation with co2 microphysics
+      if (igcm_co2_ice.ne.0) then
+        co2totB = 0. ! added by C.M.
+        do ig=1,ngrid
+          do l=1,nlayer
+            co2totB = co2totB + (zplev(ig,l)-zplev(ig,l+1))/g*
+     &             (pq(ig,l,igcm_co2)+pq(ig,l,igcm_co2_ice)
+     &        +(pdq(ig,l,igcm_co2)+pdq(ig,l,igcm_co2_ice))*ptimestep)
+          enddo
+          co2totB = co2totB + co2ice(ig)
         enddo
-        co2totB = co2totB + co2ice(ig)
-      enddo
-
-      call WRITEDIAGFI(ngrid,'co2conservation',
-     &                   'Total CO2 mass conservation in physic',
-     &                   '%',0,(co2totA-co2totB)/co2totA)
-      call test_vmr(pq(:,:,igcm_co2), pdq(:,:,igcm_co2), ptimestep,
-     &               ngrid, nlayer, 'end physiq_mod')
-
+
+        call WRITEDIAGFI(ngrid,'co2conservation',
+     &                     'Total CO2 mass conservation in physic',
+     &                     '%',0,(co2totA-co2totB)/co2totA)
+        call test_vmr(pq(:,:,igcm_co2), pdq(:,:,igcm_co2), ptimestep,
+     &                 ngrid, nlayer, 'end physiq_mod')
+      endif ! of if (igcm_co2_ice.ne.0)
 ! XIOS outputs
 #ifdef CPP_XIOS