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

Timestamp:

Jan 5, 2018 9:27:03 AM (6 years ago)

Author:

maronga

Message:

bugfixes for spinup mechanism to work with lsm+usm+radiation

File:

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

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for spinups (end_time was increased twice in case of LSM + USM runs)
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -1976 +1979 @@
 
 
-!        IF ( surf_t_surface_p%var_1d(m) < 270.0_wp .OR. surf_t_surface_p%var_1d(m) > 350.0_wp )  THEN
-!           PRINT*, "myid: ", myid
-!           PRINT*, "m: ", m
-!           PRINT*, "i,j,k: ", i, j, k
-!           PRINT*, "pt_p: ", surf_t_surface_p%var_1d(m)
-!           PRINT*, "f_shf: ", f_shf
-!           PRINT*, "f_qsws: ", f_qsws
-!         ENDIF
-
-
 !        pt(k+k_off,j+j_off,i+i_off) = surf_t_surface_p%var_1d(m) / exn  !is actually no air temperature
        surf%pt_surface(m)          = surf_t_surface_p%var_1d(m) / exn
@@ -4527 +4520 @@
        IF ( spinup_time > 0.0_wp )  THEN
           coupling_start_time = spinup_time
-          end_time = end_time + spinup_time
           IF ( spinup_pt_mean == 9999999.9_wp )  THEN
              spinup_pt_mean = pt_surface
           ENDIF
-          spinup = .TRUE.
+          IF ( .NOT. spinup )  THEN
+             end_time = end_time + spinup_time
+             spinup = .TRUE.
+          ENDIF
        ENDIF