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

Timestamp:

Aug 15, 2013 8:46:27 AM (11 years ago)

Author:

raasch

Message:

tridia-solver moved to seperate module; the tridiagonal matrix coefficients of array tri are calculated only once at the beginning

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! checks for poisfft_hybrid removed
 !
 ! Former revisions:
@@ -674 +674 @@
 !-- Check whether there are any illegal values
 !-- Pressure solver:
-    IF ( psolver /= 'poisfft'  .AND.  psolver /= 'poisfft_hybrid'  .AND. &
+    IF ( psolver /= 'poisfft'  .AND. &
          psolver /= 'sor'  .AND.  psolver /= 'multigrid' )  THEN
        message_string = 'unknown solver for perturbation pressure: psolver' // &
@@ -680 +680 @@
        CALL message( 'check_parameters', 'PA0016', 1, 2, 0, 6, 0 )
     ENDIF
-
-#if defined( __parallel )
-    IF ( psolver == 'poisfft_hybrid'  .AND.  pdims(2) /= 1 )  THEN
-       message_string = 'psolver = "' // TRIM( psolver ) // '" only works ' // &
-                        'for a 1d domain-decomposition along x & please do' // &
-                        ' not set npey/=1 in the parameter file'
-       CALL message( 'check_parameters', 'PA0017', 1, 2, 0, 6, 0 )
-    ENDIF
-#else
-    IF ( psolver == 'poisfft_hybrid' )  THEN
-       message_string = 'psolver = "' // TRIM( psolver ) // '" only works' // &
-                        ' for a parallel environment'
-       CALL message( 'check_parameters', 'PA0019', 1, 2, 0, 6, 0 )
-    ENDIF
-#endif
 
     IF ( psolver == 'multigrid' )  THEN