Changeset 3303 for palm/trunk/SOURCE/swap_timelevel.f90

Timestamp:

Oct 3, 2018 12:04:15 PM (6 years ago)

Author:

raasch

Message:

salinity allowed to be switched off, bugfix for swapping in case of ocean mode

File:

• palm/trunk/SOURCE/swap_timelevel.f90 (modified) (5 diffs)

palm/trunk/SOURCE/swap_timelevel.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for swapping in case of ocean mode
+! 
+! 3294 2018-10-01 02:37:10Z raasch
 ! changes concerning modularization of ocean option
 ! 
@@ -219 +222 @@
     IF ( gust_module_enabled )                CALL gust_swap_timelevel( 0 )
     IF ( land_surface )                       CALL lsm_swap_timelevel( 0 )
-    IF ( ocean_mode )                         CALL ocean_swap_timelevl( 0 )
+    IF ( ocean_mode )                         CALL ocean_swap_timelevel( 0 )
     CALL tcm_swap_timelevel( 0 )
     IF ( urban_surface )                      CALL usm_swap_timelevel( 0 )
@@ -237 +240 @@
              pt => pt_1;  pt_p => pt_2
           ENDIF
-          IF ( ocean_mode )  THEN
-             sa => sa_1;  sa_p => sa_2
-          ENDIF
           IF ( humidity )  THEN
              q => q_1;    q_p => q_2
@@ -257 +257 @@
              pt => pt_2;  pt_p => pt_1
           ENDIF
-          IF ( ocean_mode )  THEN
-             sa => sa_2;  sa_p => sa_1
-          ENDIF
           IF ( humidity )  THEN
              q => q_2;    q_p => q_1
@@ -271 +268 @@
     END SELECT
 
+    IF ( humidity  .AND.  bulk_cloud_model )  THEN
+       CALL bcm_swap_timelevel( MOD( timestep_count, 2) )
+    ENDIF
+
     IF ( air_chemistry )  CALL chem_swap_timelevel( MOD( timestep_count, 2) )
 
-    CALL tcm_swap_timelevel ( MOD( timestep_count, 2) )
-
-    IF ( humidity  .AND.  bulk_cloud_model )  THEN
-       CALL bcm_swap_timelevel ( MOD( timestep_count, 2) )
+    IF ( gust_module_enabled )  THEN
+       CALL gust_swap_timelevel( MOD( timestep_count, 2) )
     ENDIF
 
     IF ( land_surface )  THEN
-       CALL lsm_swap_timelevel ( MOD( timestep_count, 2) )
-    ENDIF
+       CALL lsm_swap_timelevel( MOD( timestep_count, 2) )
+    ENDIF
+
+    IF ( ocean_mode )  THEN
+       CALL ocean_swap_timelevel( MOD( timestep_count, 2 ) )
+    ENDIF
+
+    CALL tcm_swap_timelevel( MOD( timestep_count, 2) )
 
     IF ( urban_surface )  THEN
-       CALL usm_swap_timelevel ( MOD( timestep_count, 2) )
-    ENDIF
-
-    IF ( gust_module_enabled )  THEN
-       CALL gust_swap_timelevel ( MOD( timestep_count, 2) )
+       CALL usm_swap_timelevel( MOD( timestep_count, 2) )
     ENDIF