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

Timestamp:

Oct 29, 2013 1:21:31 PM (10 years ago)

Author:

heinze

Message:

Undoing commit 1239

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! profiles of ug and vg added
-! checks for nudging and large scale forcing from external file
+!
 !
 ! Former revisions:
@@ -312 +311 @@
     USE statistics
     USE subsidence_mod
-    USE statistics
     USE transpose_indices
 
@@ -1608 +1606 @@
     ENDIF
 
-    IF (myid == 0 )THEN
-      PRINT*, "vorher surface_heatflux: ", surface_heatflux 
-    END IF
-
-    IF ( surface_heatflux == 9999999.9  .AND.  .NOT. large_scale_forcing )  THEN
-        constant_heatflux     = .FALSE.
-    ELSE
-        constant_heatflux     = .TRUE.
-        IF ( TRIM( initializing_actions ) /= 'read_restart_data' ) THEN
-           surface_heatflux      = shf_surf(1)
-        ENDIF
-    ENDIF
-
-    IF (myid == 0 )THEN
-      PRINT*, "nachher surface_heatflux: ", surface_heatflux 
-    END IF
-
+    IF ( surface_heatflux == 9999999.9 )  constant_heatflux     = .FALSE.
     IF ( top_heatflux     == 9999999.9 )  constant_top_heatflux = .FALSE.
 
@@ -1744 +1726 @@
        ENDIF
 
-       IF ( surface_waterflux == 9999999.9  .AND.  &
-                             .NOT. large_scale_forcing )  THEN
-           constant_waterflux     = .FALSE.
-       ELSE
-           constant_waterflux     = .TRUE.
-           IF ( TRIM( initializing_actions ) /= 'read_restart_data' ) THEN
-              surface_waterflux      = qsws_surf(1)
-           ENDIF
-       ENDIF
+       IF ( surface_waterflux == 9999999.9 )  constant_waterflux = .FALSE.
 
 !
@@ -2692 +2666 @@
              ENDIF
 
-          CASE ( 'ug' )
-             dopr_index(i) = 78
-             dopr_unit(i)  = 'm/s'
-             hom(:,2,78,:) = SPREAD( zu, 2, statistic_regions+1 )
-
-          CASE ( 'vg' )
-             dopr_index(i) = 79
-             dopr_unit(i)  = 'm/s'
-             hom(:,2,79,:) = SPREAD( zu, 2, statistic_regions+1 )
-
           CASE DEFAULT
 
@@ -3633 +3597 @@
 
 !
-!-- Check nudging and large scale forcing from external file
-    IF ( nudging .AND. ( .NOT. large_scale_forcing ) )  THEN
-       message_string = 'Nudging requires large_scale_forcing = .T.. &'// &
-                        'Surface fluxes and geostrophic wind should be &'// &
-                        'prescribed in file LSF_DATA'
-       CALL message( 'check_parameters', 'PA0374', 1, 2, 0, 6, 0 )
-    ENDIF
-
-    IF ( large_scale_forcing .AND. ( bc_lr /= 'cyclic'  .OR. &
-                                    bc_ns /= 'cyclic' ) )  THEN
-       message_string = 'Non-cyclic lateral boundaries do not allow for &' // &
-                        'the usage of large scale forcing from external file.'
-       CALL message( 'check_parameters', 'PA0375', 1, 2, 0, 6, 0 )
-     ENDIF
-
-    IF ( large_scale_forcing .AND. ( .NOT. humidity ) )  THEN
-       message_string = 'The usage of large scale forcing from external &'//& 
-                        'file LSF_DATA requires humidity = .T..'
-       CALL message( 'check_parameters', 'PA0376', 1, 2, 0, 6, 0 )
-     ENDIF
-
-    IF ( large_scale_forcing .AND. topography /= 'flat' )  THEN
-       message_string = 'The usage of large scale forcing from external &'//& 
-                        'file LSF_DATA is not implemented for non-flat topography'
-       CALL message( 'check_parameters', 'PA0377', 1, 2, 0, 6, 0 )
-    ENDIF
-
-    IF ( large_scale_forcing .AND.  ocean  )  THEN
-       message_string = 'The usage of large scale forcing from external &'//& 
-                        'file LSF_DATA is not implemented for ocean runs'
-       CALL message( 'check_parameters', 'PA0378', 1, 2, 0, 6, 0 )
-    ENDIF
-!
 !-- Check &userpar parameters
     CALL user_check_parameters