Changeset 2688 for palm/trunk

Timestamp:

Dec 12, 2017 5:27:04 PM (7 years ago)

Author:

Giersch

Message:

Error message PA0476 added. Bugfix in case of coupled runs.

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• surface_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Check if humidity is set to TRUE in the _p3d file for coupled runs
+! 
+! 2669 2017-12-06 16:03:27Z raasch
 ! mrun-string replaced by palmrun
 ! 
@@ -647 +650 @@
 
 !
+!-- Check if humidity is set to TRUE in case of the atmospheric run (for coupled runs)
+    IF ( coupling_mode == 'atmosphere_to_ocean' .AND. humidity == .FALSE.) THEN
+       message_string = ' Humidity has to be set to .T. in the _p3d file for ' //      &
+                        'coupled runs between ocean and atmosphere.'
+       CALL message( 'check_parameters', 'PA0476', 1, 2, 0, 6, 0 )
+    ENDIF
+   
+!
 !-- Check dt_coupling, restart_time, dt_restart, end_time, dx, dy, nx and ny
     IF ( coupling_mode /= 'uncoupled'  .AND.                                   &

palm/trunk/SOURCE/surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Allocation and initialization of the latent heat flux (qsws) at the top of 
+! the ocean domain in case of coupled runs. In addtion, a double if-query has 
+! been removed.  
+! 
+! 2638 2017-11-23 12:44:23Z raasch
 ! bugfix for constant top momentumflux
 ! 
@@ -822 +827 @@
 !
 !--    Latent heat flux
-       IF ( humidity )  THEN
+       IF ( humidity .OR. coupling_mode == 'ocean_to_atmosphere')  THEN
           ALLOCATE ( surfaces%qsws(1:surfaces%ns) )      
        ENDIF 
@@ -1518 +1523 @@
              IF ( coupling_mode == 'ocean_to_atmosphere' )  THEN
                 surf%shf(num_h) = 0.0_wp
+                surf%qsws(num_h) = 0.0_wp
              ENDIF
 !
@@ -1540 +1546 @@
              IF ( ocean .AND. constant_top_salinityflux)                       &
                 surf%sasws(num_h) = top_salinityflux
-!
-!--          Initialization in case of a coupled model run
-             IF ( coupling_mode == 'ocean_to_atmosphere' )  THEN
-                surf%shf(num_h) = 0.0_wp
-             ENDIF
 !
 !--          Top momentum fluxes