Changeset 1484 for trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

Timestamp:

Oct 15, 2015, 2:35:35 PM (9 years ago)

Author:

mturbet

Message:

Harmonization of surface tracer tendencies calculation

File:

• trunk/LMDZ.GENERIC/libf/phystd/physiq.F90 (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

@@ -279 +279 @@
       ! For Surface Tracers : (kg/m2/s)
       real dqsurf(ngrid,nq)                 ! Cumulated tendencies.
-      real zdqslscale(ngrid,nq)             ! Largescale routine.
+      real zdqsurfc(ngrid)                  ! Condense_co2 routine.
       real zdqsdif(ngrid,nq)                ! Turbdiff/vdifc routines.
       real zdqssed(ngrid,nq)                ! Callsedim routine.
@@ -1200 +1200 @@
                            capcal,pplay,pplev,tsurf,pt,                  &
                            pphi,pdt,pdu,pdv,zdtsurf,pu,pv,pq,pdq,        &
-                           qsurf(1,igcm_co2_ice),albedo,emis,            &
+                           qsurf(1:ngrid,igcm_co2_ice),zdqsurfc,         &
+                           albedo,emis,                                  &
                            albedo_bareground,albedo_co2_ice_SPECTV,      &
                            zdtc,zdtsurfc,pdpsrf,zduc,zdvc,               &
                            zdqc)
 
-         pdt(1:ngrid,1:nlayer)=pdt(1:ngrid,1:nlayer)+zdtc(1:ngrid,1:nlayer)
-         pdv(1:ngrid,1:nlayer)=pdv(1:ngrid,1:nlayer)+zdvc(1:ngrid,1:nlayer)
-         pdu(1:ngrid,1:nlayer)=pdu(1:ngrid,1:nlayer)+zduc(1:ngrid,1:nlayer)
-         zdtsurf(1:ngrid) = zdtsurf(1:ngrid) + zdtsurfc(1:ngrid)
-
-         pdq(1:ngrid,1:nlayer,1:nq)=pdq(1:ngrid,1:nlayer,1:nq)+ zdqc(1:ngrid,1:nlayer,1:nq) 
+         pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+zdtc(1:ngrid,1:nlayer)
+         pdv(1:ngrid,1:nlayer) = pdv(1:ngrid,1:nlayer)+zdvc(1:ngrid,1:nlayer)
+         pdu(1:ngrid,1:nlayer) = pdu(1:ngrid,1:nlayer)+zduc(1:ngrid,1:nlayer)
+         zdtsurf(1:ngrid)      = zdtsurf(1:ngrid) + zdtsurfc(1:ngrid)
+
+         pdq(1:ngrid,1:nlayer,1:nq)   = pdq(1:ngrid,1:nlayer,1:nq)+ zdqc(1:ngrid,1:nlayer,1:nq)
+         dqsurf(1:ngrid,igcm_co2_ice) = dqsurf(1:ngrid,igcm_co2_ice) + zdqsurfc(1:ngrid)
 
          ! test energy conservation
@@ -1503 +1505 @@
                         sea_ice)
 
-            zdtsurf(1:ngrid)    = zdtsurf(1:ngrid) + zdtsurf_hyd(1:ngrid)
-            qsurf(1:ngrid,1:nq) = qsurf(1:ngrid,1:nq) + ptimestep*dqs_hyd(1:ngrid,1:nq)
+            zdtsurf(1:ngrid)     = zdtsurf(1:ngrid) + zdtsurf_hyd(1:ngrid)
+            dqsurf(1:ngrid,1:nq) = dqsurf(1:ngrid,1:nq) + dqs_hyd(1:ngrid,1:nq)
+            
+            qsurf(1:ngrid,1:nq) = qsurf(1:ngrid,1:nq) + ptimestep*dqsurf(1:ngrid,1:nq)
 
             ! Test energy conservation
@@ -1525 +1529 @@
          else ! of if (hydrology)
 
-            qsurf(1:ngrid,1:nq)=qsurf(1:ngrid,1:nq)+ptimestep*dqsurf(1:ngrid,1:nq)
+            qsurf(1:ngrid,1:nq) = qsurf(1:ngrid,1:nq) + ptimestep*dqsurf(1:ngrid,1:nq)
 
          end if ! of if (hydrology)