Changeset 3873 for palm/trunk/SOURCE/advec_ws.f90

Timestamp:

Apr 8, 2019 3:44:30 PM (5 years ago)

Author:

knoop

Message:

Moved ocean_mode specific code from advec_ws to ocean_mod + implemented ocean_actions

File:

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

palm/trunk/SOURCE/advec_ws.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Moved ocean_mode specific code to ocean_mod
+! 
+! 3872 2019-04-08 15:03:06Z knoop
 ! Moved all USE statements to module level + removed salsa dependency
 ! 
@@ -287 +290 @@
 
     USE control_parameters,                                                    &
-        ONLY:  humidity, loop_optimization, passive_scalar, ocean_mode,        &
+        ONLY:  humidity, loop_optimization, passive_scalar,                    &
                rans_tke_e, ws_scheme_mom, ws_scheme_sca,                       &
                momentum_advec, scalar_advec,                                   &
@@ -409 +412 @@
              ALLOCATE( sums_wsss_ws_l(nzb:nzt+1,0:threads_per_task-1) )
              sums_wsss_ws_l = 0.0_wp
-          ENDIF
-
-          IF ( ocean_mode )  THEN
-             ALLOCATE( sums_wssas_ws_l(nzb:nzt+1,0:threads_per_task-1) )
-             sums_wssas_ws_l = 0.0_wp
           ENDIF
 
@@ -472 +470 @@
                 ALLOCATE( flux_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1),    &
                           diss_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
-             ENDIF
-
-             IF ( ocean_mode )  THEN
-                ALLOCATE( flux_s_sa(nzb+1:nzt,0:threads_per_task-1),           &
-                          diss_s_sa(nzb+1:nzt,0:threads_per_task-1) )
-                ALLOCATE( flux_l_sa(nzb+1:nzt,nys:nyn,0:threads_per_task-1),   &
-                          diss_l_sa(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
              ENDIF
 
@@ -1112 +1103 @@
           IF ( humidity       )  sums_wsqs_ws_l = 0.0_wp
           IF ( passive_scalar )  sums_wsss_ws_l = 0.0_wp
-          IF ( ocean_mode )  sums_wssas_ws_l = 0.0_wp
 
        ENDIF