Changeset 2299 for palm/trunk/SOURCE/land_surface_model_mod.f90

Timestamp:

Jun 29, 2017 10:14:38 AM (7 years ago)

Author:

maronga

Message:

improvements for spinup mechanism

File:

• palm/trunk/SOURCE/land_surface_model_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Removed pt_p from USE statement. Adjusted call to lsm_soil_model to allow
+! spinups without soil moisture prediction
+! 
+! 2298 2017-06-29 09:28:18Z raasch
 ! type of write_binary changed from CHARACTER to LOGICAL
 ! 
@@ -228 +232 @@
  
     USE arrays_3d,                                                             &
-        ONLY:  hyp, pt, pt_p, prr, q, q_p, ql, vpt, u, v, w
+        ONLY:  hyp, pt, prr, q, q_p, ql, vpt, u, v, w
 
     USE cloud_parameters,                                                      &
@@ -2884 +2888 @@
 !> temperature and water content.
 !------------------------------------------------------------------------------!
-    SUBROUTINE lsm_soil_model( horizontal, l )
+    SUBROUTINE lsm_soil_model( horizontal, l, calc_soil_moisture )
 
 
@@ -2892 +2896 @@
        INTEGER(iwp) ::  l       !< surface-data type index indication facing
        INTEGER(iwp) ::  m       !< running index
+
+       LOGICAL, INTENT(IN) ::  calc_soil_moisture !< flag indicating whether soil moisture shall be calculated or not.
 
        LOGICAL      ::  horizontal !< flag indication horizontal wall, required to set pointer accordingly
@@ -3059 +3065 @@
 
              ENDDO
+
+          ENDIF
+
+       ENDDO
+
+
+       DO  m = 1, surf%ns
+
+          IF (  .NOT.  surf%water_surface(m)  .AND.  calc_soil_moisture )  THEN
+
 
 !