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

Timestamp:

Oct 1, 2018 2:37:10 AM (6 years ago)

Author:

raasch

Message:

modularization of the ocean code

File:

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

palm/trunk/SOURCE/swap_timelevel.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! changes concerning modularization of ocean option
+! 
+! 3274 2018-09-24 15:42:55Z knoop
 ! Modularization of all bulk cloud physics code components
 ! 
@@ -147 +150 @@
         ONLY:  chem_swap_timelevel 
 
-    USE land_surface_model_mod,                                                &
-        ONLY: lsm_swap_timelevel
-
     USE cpulog,                                                                &
         ONLY: cpu_log, log_point
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry, humidity, land_surface,                          &
-               neutral, ocean, passive_scalar, timestep_count, urban_surface
+        ONLY:  air_chemistry, humidity, land_surface, neutral, ocean_mode,     &
+               passive_scalar, timestep_count, urban_surface
 
     USE gust_mod,                                                              &
@@ -164 +164 @@
         ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
 #endif
+
+    USE land_surface_model_mod,                                                &
+        ONLY: lsm_swap_timelevel
+
+    USE ocean_mod,                                                             &
+        ONLY:  ocean_swap_timelevel
 
     USE pmc_interface,                                                         &
@@ -202 +208 @@
     ENDDO
 
-    CALL tcm_swap_timelevel ( 0 )
-
-    IF ( ocean )  THEN
-       sa = sa_p
-    ENDIF
-
     IF ( humidity )  THEN
        q = q_p
@@ -214 +214 @@
     IF ( passive_scalar )  s = s_p             
 
-    IF ( humidity  .AND.  bulk_cloud_model )  THEN
-       CALL bcm_swap_timelevel ( 0 )
-    ENDIF
-
-    IF ( land_surface )  THEN
-       CALL lsm_swap_timelevel ( 0 )
-    ENDIF
-
-    IF ( urban_surface )  THEN
-       CALL usm_swap_timelevel ( 0 )
-    ENDIF
-
-    IF ( gust_module_enabled )  THEN
-       CALL gust_swap_timelevel ( 0 )
-    ENDIF
-
+!
+!-- Swapping the timelevel of other modules
+    IF ( humidity  .AND.  bulk_cloud_model )  CALL bcm_swap_timelevel( 0 )
+    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 )
+    CALL tcm_swap_timelevel( 0 )
+    IF ( urban_surface )                      CALL usm_swap_timelevel( 0 )
 
     CALL cpu_log( log_point(28), 'swap_timelevel (nop)', 'stop' )
@@ -245 +237 @@
              pt => pt_1;  pt_p => pt_2
           ENDIF
-          IF ( ocean )  THEN
+          IF ( ocean_mode )  THEN
              sa => sa_1;  sa_p => sa_2
           ENDIF
@@ -254 +246 @@
              s => s_1;    s_p => s_2
           ENDIF
-
-          IF ( air_chemistry )  CALL chem_swap_timelevel(0)
 
           swap_level = 1
@@ -267 +257 @@
              pt => pt_2;  pt_p => pt_1
           ENDIF
-          IF ( ocean )  THEN
+          IF ( ocean_mode )  THEN
              sa => sa_2;  sa_p => sa_1
           ENDIF
@@ -277 +267 @@
           ENDIF
 
-          IF ( air_chemistry )  CALL chem_swap_timelevel(1)
-
           swap_level = 2
 
     END SELECT
+
+    IF ( air_chemistry )  CALL chem_swap_timelevel( MOD( timestep_count, 2) )
 
     CALL tcm_swap_timelevel ( MOD( timestep_count, 2) )