Changeset 2394 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Jul 2, 2020, 3:42:38 PM (5 years ago)

Author:

cmathe

Message:

improvedco2clouds_mod: clean

File:

• trunk/LMDZ.MARS/libf/phymars/improvedco2clouds_mod.F90 (modified) (1 diff)

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

@@ -528 +528 @@
           zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2) - dMice
         end if
-      end if ! nouveau end if
+      end if ! if zq(ccnco2_number) >= 1
 !----------------------------------------------------------------------------------------------------------------------!
 ! 4.3 Dust cores releasing if no more co2 ice
 !----------------------------------------------------------------------------------------------------------------------!
-        ! On sublime tout
-        if ((zq(ig,l,igcm_co2_ice) <= threshold).or.(zq(ig,l,igcm_ccnco2_number)* tauscaling(ig) < 1.)) then
-
-          if (co2useh2o) then
-
-            if (mem_Mccn_co2(ig,l) > 0) then
-              zq(ig,l,igcm_ccn_mass) = zq(ig,l,igcm_ccn_mass) + mem_Mccn_co2(ig,l)
-            end if
-
-            if (mem_Mh2o_co2(ig,l) > 0) then
-              zq(ig,l,igcm_h2o_ice) = zq(ig,l,igcm_h2o_ice) + mem_Mh2o_co2(ig,l)
-            end if
-
-            if (mem_Nccn_co2(ig,l) > 0) then
-              zq(ig,l,igcm_ccn_number) = zq(ig,l,igcm_ccn_number) + mem_Nccn_co2(ig,l)
-            end if
-
+      ! On sublime tout
+      if ((zq(ig,l,igcm_co2_ice) <= threshold).or.(zq(ig,l,igcm_ccnco2_number) * tauscaling(ig) < 1.)) then
+
+        if (co2useh2o) then
+
+          if (mem_Mccn_co2(ig,l) > 0) then
+            zq(ig,l,igcm_ccn_mass) = zq(ig,l,igcm_ccn_mass) + mem_Mccn_co2(ig,l)
           end if
 
-          zq(ig,l,igcm_dust_mass) = zq(ig,l,igcm_dust_mass) + zq(ig,l,igcm_ccnco2_mass) - ( mem_Mh2o_co2(ig,l) + &
-                                       mem_Mccn_co2(ig,l) )
-
-          zq(ig,l,igcm_dust_number) = zq(ig,l,igcm_dust_number) + zq(ig,l,igcm_ccnco2_number)  - mem_Nccn_co2(ig,l)
-
-          zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2)  + zq(ig,l,igcm_co2_ice)
-
-          zq(ig,l,igcm_co2_ice) = 0.
-          zq(ig,l,igcm_ccnco2_mass) = 0.
-          zq(ig,l,igcm_ccnco2_number) = 0.
-          mem_Nccn_co2(ig,l) = 0.
-          mem_Mh2o_co2(ig,l) = 0.
-          mem_Mccn_co2(ig,l) = 0.
-          riceco2(ig,l) = 0.
-        end if !of if co2_ice < threshold
-!      end if ! of if NCCN > 1
+          if (mem_Mh2o_co2(ig,l) > 0) then
+            zq(ig,l,igcm_h2o_ice) = zq(ig,l,igcm_h2o_ice) + mem_Mh2o_co2(ig,l)
+          end if
+
+          if (mem_Nccn_co2(ig,l) > 0) then
+            zq(ig,l,igcm_ccn_number) = zq(ig,l,igcm_ccn_number) + mem_Nccn_co2(ig,l)
+          end if
+
+        end if
+
+        zq(ig,l,igcm_dust_mass) = zq(ig,l,igcm_dust_mass) + zq(ig,l,igcm_ccnco2_mass) - ( mem_Mh2o_co2(ig,l) + &
+                                     mem_Mccn_co2(ig,l) )
+
+        zq(ig,l,igcm_dust_number) = zq(ig,l,igcm_dust_number) + zq(ig,l,igcm_ccnco2_number)  - mem_Nccn_co2(ig,l)
+
+        zq(ig,l,igcm_co2) = zq(ig,l,igcm_co2)  + zq(ig,l,igcm_co2_ice)
+
+        zq(ig,l,igcm_co2_ice) = 0.
+        zq(ig,l,igcm_ccnco2_mass) = 0.
+        zq(ig,l,igcm_ccnco2_number) = 0.
+        mem_Nccn_co2(ig,l) = 0.
+        mem_Mh2o_co2(ig,l) = 0.
+        mem_Mccn_co2(ig,l) = 0.
+        riceco2(ig,l) = 0.
+      end if !of if co2_ice < threshold or zq(ccnco2_number) < 1
     end do ! of ig loop
   end do ! of nlayer loop