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

Timestamp:

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

Author:

raasch

Message:

modularization of the ocean code

File:

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

palm/trunk/SOURCE/turbulence_closure_mod.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
 ! 
@@ -164 +167 @@
                initializing_actions, intermediate_timestep_count,              &
                intermediate_timestep_count_max, km_constant,                   &
-               les_dynamic, les_mw, ocean, plant_canopy, prandtl_number,       &
-               prho_reference, pt_reference, rans_mode, rans_tke_e, rans_tke_l,&
+               les_dynamic, les_mw, ocean_mode, plant_canopy, prandtl_number,  &
+               pt_reference, rans_mode, rans_tke_e, rans_tke_l,                &
                simulated_time,timestep_scheme, turbulence_closure,             &
                turbulent_inflow, use_upstream_for_tke, vpt_reference,          &
@@ -190 +193 @@
 
     USE kinds
+
+    USE ocean_mod,                                                             &
+        ONLY:  prho_reference
 
     USE pegrid
@@ -1116 +1122 @@
                 e  = e_init
              ELSE
-                IF ( .NOT. ocean )  THEN
+                IF ( .NOT. ocean_mode )  THEN
                    kh   = 0.01_wp   ! there must exist an initial diffusion, because 
                    km   = 0.01_wp   ! otherwise no TKE would be produced by the
@@ -1160 +1166 @@
              e  = e_init
           ELSE
-             IF ( .NOT. ocean )  THEN
+             IF ( .NOT. ocean_mode )  THEN
                 kh   = 0.01_wp   ! there must exist an initial diffusion, because 
                 km   = 0.01_wp   ! otherwise no TKE would be produced by the
@@ -2155 +2161 @@
 
        IF ( .NOT. humidity )  THEN
-          IF ( ocean )  THEN
+          IF ( ocean_mode )  THEN
              CALL diffusion_e( prho, prho_reference )
           ELSE
@@ -2423 +2429 @@
 
        IF ( .NOT. humidity )  THEN
-          IF ( ocean )  THEN
+          IF ( ocean_mode )  THEN
              CALL diffusion_e( i, j, prho, prho_reference )
           ELSE
@@ -2934 +2940 @@
           IF ( .NOT. humidity )  THEN
 
-             IF ( ocean )  THEN
+             IF ( ocean_mode )  THEN
 !
 !--             So far in the ocean no special treatment of density flux
@@ -3738 +3744 @@
        IF ( .NOT. humidity )  THEN
 
-          IF ( ocean )  THEN
+          IF ( ocean_mode )  THEN
 !
 !--          So far in the ocean no special treatment of density flux in