Changeset 2182

Timestamp:

Nov 24, 2019, 2:11:27 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Fix in surfini for the 1D model when imposing watercaptag.
Protect output of CO2 saturation in physiq to when there is a CO2 tracer.
EM

Location:

trunk/LMDZ.MARS

Files:

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

trunk/LMDZ.MARS/README

@@ -2786 +2786 @@
 == 14/11/2019 == MV
 Add the sublimation/condensation latent heat release from the surface water ice in vdifc_mod.F. It can be activated or deactivated with the new flag "latentheat" (for now latentheat=false by default).
+
+== 24/11/2019 == EM
+Fix in surfini for the 1D model when imposing watercaptag.
+Protect output of CO2 saturation in physiq to when there is a CO2 tracer.

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

@@ -3089 +3089 @@
      &                                   ,"kg.m-2",0,co2ice)
 
-      call co2sat(ngrid*nlayer,zt,zplay,zqsatco2)
-         do ig=1,ngrid 
+         if (igcm_co2.ne.0) then
+          call co2sat(ngrid*nlayer,zt,zplay,zqsatco2)
+           do ig=1,ngrid 
             do l=1,nlayer
                satuco2(ig,l) = zq(ig,l,igcm_co2)* 
@@ -3098 +3099 @@
 c     &              ,zt(ig,l),ptime
             enddo
-         enddo
+           enddo
+          endif
 
 c         CALL writeg1d(ngrid,nlayer,zt,'temp','K')

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

@@ -452 +452 @@
        endif !of if (is_master)
        
-       ! Now scatter fields watercaptag and dryness from master to all
-       ! (is just a plain copy in serial mode)
-       call scatter(dryness_glo,dryness)
-       call scatter(watercaptag_glo,watercaptag)
-       
+       if (ngrid.gt.1) then
+        ! Now scatter fields watercaptag and dryness from master to all
+        ! (is just a plain copy in serial mode)
+        call scatter(dryness_glo,dryness)
+        call scatter(watercaptag_glo,watercaptag)
+       endif
        ELSE
          watercaptag(:) = .false.