Changeset 2970 for palm/trunk/SOURCE/check_parameters.f90

Timestamp:

Apr 13, 2018 3:09:23 PM (6 years ago)

Author:

suehring

Message:

Bugfix in large-scale forcing

File:

• palm/trunk/SOURCE/check_parameters.f90 (modified) (4 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in old large-scale forcing mode
+! 
+! 2964 2018-04-12 16:04:03Z Giersch
 ! Calculation of fixed number of output time levels for parallel netcdf output
 ! has been revised (based on calculations in netcdf_interface_mod)
@@ -644 +647 @@
 
     USE lsf_nudging_mod,                                                       &
-        ONLY:  lsf_nudging_check_parameters, lsf_nudging_check_data_output_pr, &
-               qsws_surf, shf_surf
+        ONLY:  lsf_nudging_check_parameters, lsf_nudging_check_data_output_pr
 
     USE kinds
@@ -2004 +2006 @@
           ELSEIF ( ibc_pt_b == 1 )  THEN
              constant_heatflux = .TRUE.
-             IF ( TRIM( initializing_actions ) /= 'read_restart_data'  .AND.   &
-                  .NOT.  land_surface )  THEN
-                surface_heatflux = shf_surf(1)
-             ELSE
-                surface_heatflux = 0.0_wp
-             ENDIF
+             surface_heatflux = 0.0_wp
           ENDIF
        ENDIF
     ELSE
-        constant_heatflux = .TRUE.
-        IF ( TRIM( initializing_actions ) /= 'read_restart_data'  .AND.        &
-             large_scale_forcing  .AND.  .NOT.  land_surface )  THEN
-           surface_heatflux = shf_surf(1)
-        ENDIF
+       constant_heatflux = .TRUE.
     ENDIF
 
@@ -2132 +2125 @@
              ELSEIF ( ibc_q_b == 1 )  THEN
                 constant_waterflux = .TRUE.
-                IF ( TRIM( initializing_actions ) /= 'read_restart_data' )  THEN
-                   surface_waterflux = qsws_surf(1)
-                ENDIF
              ENDIF
           ENDIF
        ELSE
           constant_waterflux = .TRUE.
-          IF ( TRIM( initializing_actions ) /= 'read_restart_data'  .AND.      &
-               large_scale_forcing )  THEN
-             surface_waterflux = qsws_surf(1)
-          ENDIF
        ENDIF