Changeset 3134

Timestamp:

Nov 21, 2023, 2:10:48 PM (14 months ago)

Author:

evos

Message:

Mars PCM

Fixing a bug that fixes the watercap output when caps is on and zdqsdif output when using paleoclimate. all in
vdifc_mod.F90

Eran Vos

File:

• trunk/LMDZ.MARS/libf/phymars/vdifc_mod.F (modified) (7 diffs)

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

@@ -296 +296 @@
       zq1temp_regolith(1:ngrid)=0 
       zdqsdif_tot(1:ngrid)=0
-      !h2o_ice_depth(1:ngrid,1:nslope)=1
+      h2o_ice_depth(1:ngrid,1:nslope)=1
 c    ** calcul de rho*dz et dt*rho/dz=dt*rho**2 g/dp
 c       avec rho=p/RT=p/ (R Theta) (p/ps)**kappa
@@ -963 +963 @@
            saved_h2o_vap(:)= zq(:,1,igcm_h2o_vap)    
            DO ig=1,ngrid
-            !nsubtimestep(ig)=1 for debug
+!           nsubtimestep(ig)=1 !for debug
             subtimestep = ptimestep/nsubtimestep(ig)
+                          call write_output('subtimestep',
+     &                'vdifc substimestep length','s',subtimestep)
             ztsrf(ig)=ptsrf(ig,islope)  !  +pdtsrf(ig)*subtimestep
             zq_tmp_vap(ig,:,:) =zq(ig,:,:)
@@ -970 +972 @@
             DO tsub=1,nsubtimestep(ig)
               if(tsub.eq.nsubtimestep(ig)) writeoutput = .true.
+
 c           C'est parti ! 
              zb(1:ngrid,2:nlay)=zkh(1:ngrid,2:nlay)*zb0(1:ngrid,2:nlay)
@@ -1009 +1012 @@
              endif
 
-
+            !zdqsdif_tot(ig) = zdqsdif_surf(ig)
 !!! Subsurface exchange
 ! Check for subsurface exchanges
@@ -1229 +1232 @@
                !needs to change to the mean of eq
               ENDIF
-              call write_output('subtimestep',
-     &                'vdifc substimestep length','s',subtimestep)
+!              call write_output('subtimestep',
+!     &                'vdifc substimestep length','s',subtimestep)
              ! ENDDO !subsurface ice subslope
 
@@ -1255 +1258 @@
               zqsurf(ig)= zqsurf(ig)+(
      &                       zdqsdif_tot(ig))*subtimestep
+              if (zqsurf(ig)<0 .and.
+     &        (.not.watercaptag(ig))) then
+                      zqsurf(ig)=0
+              endif
+
 c             Monitoring instantaneous latent heat flux in W.m-2 :
               zsurf_h2o_lh(ig,islope) = zsurf_h2o_lh(ig,islope)+
@@ -1405 +1413 @@
      &          'Flux between frost and subsurface','kg.m-2.s-1',
      &                zdqsdif_ssi_frost(:,1))
-         call write_output('subtimestep',
-     &          'vdifc substimestep length','s',subtimestep)
 
          call write_output('zdq_subtimestep',
      &          'Actual flux zdqsdif_surf*subtimestep',
-     &          'kg.m-2',zdqsdif_surf(:)*subtimestep)
-         call write_output('zdq_end',
-     &          'Flux after all contributions',
-     &          'kg.m-2.s-1',zdqsdif_surf(:))
+     &          'kg.m-2',zdqsdif_tot(:)*subtimestep)
+!         call write_output('zdq_end',
+!     &          'Flux after all contributions',
+!     &          'kg.m-2.s-1',zdqsdif_tot(:))
 C       Diagnostic output for HDO
 !        if (hdo) then