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

Timestamp:

Mar 5, 2007 6:00:47 AM (17 years ago)

Author:

raasch

Message:

updating parts of Marcus changes

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! "by_user" allowed as initializing action
 !
 ! Former revisions:
@@ -292 +292 @@
 
              CASE ( 'set_constant_profiles', 'set_1d-model_profiles', &
-                    'initialize_vortex',     'initialize_ptanom' )
+                    'by_user', 'initialize_vortex',     'initialize_ptanom' )
                 action = action(position+1:)
 
@@ -308 +308 @@
        IF ( myid == 0 )  PRINT*, '+++ check_parameters: initializing_actions', &
           '"set_constant_profiles" and "set_1d-model_profiles" are not', &
+          ' allowed simultaneously'
+       CALL local_stop
+    ENDIF
+    IF ( INDEX( initializing_actions, 'set_constant_profiles' ) /= 0  .AND. &
+         INDEX( initializing_actions, 'by_user' ) /= 0 )  THEN
+       IF ( myid == 0 )  PRINT*, '+++ check_parameters: initializing_actions', &
+          '"set_constant_profiles" and "by_user" are not', &
+          ' allowed simultaneously'
+       CALL local_stop
+    ENDIF
+    IF ( INDEX( initializing_actions, 'by_user' ) /= 0  .AND. &
+         INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 )  THEN
+       IF ( myid == 0 )  PRINT*, '+++ check_parameters: initializing_actions', &
+          '"by_user" and "set_1d-model_profiles" are not', &
           ' allowed simultaneously'
        CALL local_stop