Changeset 3311 for palm/trunk

Timestamp:

Oct 5, 2018 12:34:56 PM (6 years ago)

Author:

raasch

Message:

Stokes drift is regarded in timestep calculation, check if ocean mode is used for invalid combinations

Location:

palm/trunk/SOURCE

Files:

• ocean_mod.f90 (modified) (4 diffs)
• timestep.f90 (modified) (3 diffs)

palm/trunk/SOURCE/ocean_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! check if ocean mode is used for invalid combinations
+! 
+! 3303 2018-10-03 12:04:15Z raasch
 ! salinity allowed to be switched off
 ! 
@@ -543 +546 @@
 
     USE control_parameters,                                                    &
-        ONLY:  coupling_char, coupling_mode, message_string, use_top_fluxes
-
-    IMPLICIT NONE
-
+        ONLY:  coupling_char, coupling_mode, initializing_actions,             &
+               message_string, use_top_fluxes
+
+    USE pmc_interface,                                                         &
+        ONLY:  nested_run
+
+    IMPLICIT NONE
+
+
+!
+!-- Check for invalid combinations
+    IF ( nested_run )  THEN
+       message_string = 'ocean mode not allowed for nesting'
+       CALL message( 'ocean_check_parameters', 'PA0510', 1, 2, 0, 6, 0 )
+    ENDIF
+
+    IF ( TRIM( initializing_actions ) == 'cyclic_fill' )  THEN
+       message_string = 'ocean mode does not allow cyclic-fill initialization'
+       CALL message( 'ocean_check_parameters', 'PA0511', 1, 2, 0, 6, 0 )
+    ENDIF
 
 !
@@ -557 +576 @@
 !--    Check whether an (uncoupled) atmospheric run has been declared as an
 !--    ocean run (this setting is done via palmrun-option -y)
-       message_string = 'ocean = .F. does not allow coupling_char = "' //      &
+       message_string = 'ocean mode does not allow coupling_char = "' //       &
                         TRIM( coupling_char ) // '" set by palmrun-option "-y"'
-       CALL message( 'check_parameters', 'PA0317', 1, 2, 0, 6, 0 )
+       CALL message( 'ocean_check_parameters', 'PA0317', 1, 2, 0, 6, 0 )
 
     ENDIF
@@ -592 +611 @@
           message_string = 'salinityflux must not be set for ocean run ' //    &
                            'without salinity'
-          CALL message( 'check_parameters', 'PA0509', 1, 2, 0, 6, 0 )
+          CALL message( 'ocean_check_parameters', 'PA0509', 1, 2, 0, 6, 0 )
        ENDIF
     ENDIF

palm/trunk/SOURCE/timestep.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Stokes drift is regarded in timestep calculation
+! 
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -136 +139 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  dzu, dzw, kh, km, u, v, w
+        ONLY:  dzu, dzw, kh, km, u, u_stokes_zu, v, v_stokes_zu, w
 
     USE control_parameters,                                                    &
@@ -278 +281 @@
              DO  k = nzb+1, nzt
                 dt_u_l = MIN( dt_u_l, ( dx     /                               &
-                                 ( ABS( u(k,j,i) - u_gtrans ) + 1.0E-10_wp ) ) )
+                                 ( ABS( u(k,j,i) - u_gtrans + u_stokes_zu(k) ) &
+                                   + 1.0E-10_wp ) ) )
                 dt_v_l = MIN( dt_v_l, ( dy     /                               &
-                                 ( ABS( v(k,j,i) - v_gtrans ) + 1.0E-10_wp ) ) )
+                                 ( ABS( v(k,j,i) - v_gtrans + v_stokes_zu(k) ) &
+                                   + 1.0E-10_wp ) ) )
                 dt_w_l = MIN( dt_w_l, ( dzu(k) /                               &
                                  ( ABS( w(k,j,i) )            + 1.0E-10_wp ) ) )