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

Timestamp:

Mar 26, 2012 2:18:34 PM (12 years ago)

Author:

suehring

Message:

WS5 is available in combination with topography. Version number changed from 3.8 to 3.8a. Modification in init_pt_anomaly.

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Check for topography and ws-scheme removed.
+! Check for loop_optimization = 'vector' and ws-scheme removed.
 !
 ! Former revisions:
@@ -456 +457 @@
     IF ( topography /= 'flat' )  THEN
        action = ' '
-       IF ( scalar_advec /= 'pw-scheme' )  THEN
+       IF ( scalar_advec /= 'pw-scheme' .AND. scalar_advec /= 'ws-scheme')  THEN
           WRITE( action, '(A,A)' )  'scalar_advec = ', scalar_advec
        ENDIF
-       IF ( momentum_advec /= 'pw-scheme' )  THEN
+       IF ( momentum_advec /= 'pw-scheme' .AND. momentum_advec /= 'ws-scheme' ) &
+       THEN
           WRITE( action, '(A,A)' )  'momentum_advec = ', momentum_advec
        ENDIF
@@ -488 +490 @@
           CALL message( 'check_parameters', 'PA0014', 1, 2, 0, 6, 0 )
        ENDIF
-       IF ( momentum_advec == 'ws-scheme' .OR. scalar_advec == 'ws-scheme' ) &
-       THEN
-          message_string = 'topography is still not allowed with ' // &
-                           'momentum_advec = "' // TRIM( momentum_advec ) //  &
-                           '"or scalar_advec = "' // TRIM( scalar_advec ) //'"'
-   ! message number still needs modification
-           CALL message( 'check_parameters', 'PA0341', 1, 2, 0, 6, 0 )
-       END IF
-          
 !
 !--    In case of non-flat topography, check whether the convention how to 
@@ -739 +732 @@
     IF ( collision_kernel(6:9) == 'fast' )  use_kernel_tables = .TRUE.
 
-
     IF ( TRIM( initializing_actions ) /= 'read_restart_data'  .AND.  &
          TRIM( initializing_actions ) /= 'cyclic_fill' )  THEN
@@ -1406 +1398 @@
           CALL message( 'check_parameters', 'PA0053', 1, 2, 0, 6, 0 )
        ENDIF
-       IF ( (scalar_advec == 'ws-scheme' .OR. momentum_advec == 'ws-scheme' ) &
-          .AND. loop_optimization == 'vector' ) THEN
-          message_string = 'non-cyclic lateral boundaries do not allow ' // &
-                           'loop_optimization = vector and ' //  &
-                           'scalar_advec = "' // TRIM( scalar_advec ) // '"' 
-  ! The error message number still needs modification. 
-          CALL message( 'check_parameters', 'PA0342', 1, 2, 0, 6, 0 )
-       END IF
        IF ( galilei_transformation )  THEN
           message_string = 'non-cyclic lateral boundaries do not allow ' // &