Changeset 332 for palm/trunk

Timestamp:

Jun 8, 2009 8:14:39 AM (15 years ago)

Author:

raasch

Message:

bugfix in check_parameters concerning ocean version

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -376 +376 @@
 !-- Check ocean setting
     IF ( ocean )  THEN
+
        action = ' '
        IF ( timestep_scheme(1:8) == 'leapfrog' )  THEN
@@ -387 +388 @@
           CALL message( 'check_parameters', 'PA0015', 1, 2, 0, 6, 0 )
        ENDIF
-    ENDIF
-
-!
-!-- Check whether an (uncoupled) atmospheric run has been declared as an
-!-- ocean run (this setting is done via mrun-option -y)
-    IF ( TRIM( coupling_mode ) == 'uncoupled'  .AND.  &
-         TRIM( coupling_char ) == '_O' )  THEN
+
+    ELSEIF ( TRIM( coupling_mode ) == 'uncoupled'  .AND.  &
+             TRIM( coupling_char ) == '_O' )  THEN
+!
+!--    Check whether an (uncoupled) atmospheric run has been declared as an
+!--    ocean run (this setting is done via mrun-option -y)
        message_string = 'ocean = .F. does not allow coupling_char = "' // &
                         TRIM( coupling_char ) // '" set by mrun-option "-y"'
        CALL message( 'check_parameters', 'PA0317', 1, 2, 0, 6, 0 )
+
     ENDIF