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

Timestamp:

Sep 28, 2012 6:46:45 AM (12 years ago)

Author:

raasch

Message:

subroutine prognostic_equations_noopt has been removed

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! non-optimized version of prognostic_equations not allowed any more
 !
 ! Former revisions:
@@ -488 +488 @@
     SELECT CASE ( TRIM( loop_optimization ) )
 
-       CASE ( 'acc', 'cache', 'noopt', 'vector' )
+       CASE ( 'acc', 'cache', 'vector' )
           CONTINUE
 
@@ -646 +646 @@
 !
 !-- Advection schemes:
-!       
-!-- Set the LOGICALS to enhance the performance.
-    IF ( momentum_advec == 'ws-scheme' )    ws_scheme_mom = .TRUE.
-    IF ( scalar_advec   == 'ws-scheme'   )  ws_scheme_sca = .TRUE.
-    
     IF ( momentum_advec /= 'pw-scheme'  .AND.  momentum_advec /= 'ws-scheme' ) &
     THEN
@@ -673 +668 @@
        CALL message( 'check_parameters', 'PA0024', 1, 2, 0, 6, 0 )
     ENDIF
+    IF ( scalar_advec == 'bc-scheme'  .AND.  loop_optimization == 'cache' ) &
+    THEN
+       message_string = 'advection_scheme scalar_advec = "' &
+         // TRIM( scalar_advec ) // '" not implemented for & loop_optimization = "' // &
+         TRIM( loop_optimization ) // '"'
+       CALL message( 'check_parameters', 'PA0026', 1, 2, 0, 6, 0 )
+    ENDIF
 
     IF ( use_sgs_for_particles  .AND.  .NOT. use_upstream_for_tke )  THEN
@@ -686 +688 @@
        CALL message( 'check_parameters', 'PA0349', 1, 2, 0, 6, 0 )
     ENDIF
+
+!
+!-- Set LOGICAL switches to enhance performance
+    IF ( momentum_advec == 'ws-scheme' )    ws_scheme_mom = .TRUE.
+    IF ( scalar_advec   == 'ws-scheme'   )  ws_scheme_sca = .TRUE.
 
 !