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

Timestamp:

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

Author:

raasch

Message:

modularization of the ocean code

File:

• palm/trunk/SOURCE/modules.f90 (modified) (10 diffs)

palm/trunk/SOURCE/modules.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! ocean renamed ocean_mode
+! 
+! 3289 2018-09-28 10:23:58Z suehring
 ! +num_mean_inflow_profiles
 ! 
@@ -1109 +1112 @@
     CHARACTER (LEN=20)   ::  bc_s_b = 'dirichlet'                         !< namelist parameter
     CHARACTER (LEN=20)   ::  bc_s_t = 'initial_gradient'                  !< namelist parameter
-    CHARACTER (LEN=20)   ::  bc_sa_t = 'neumann'                          !< namelist parameter
     CHARACTER (LEN=20)   ::  bc_uv_b = 'dirichlet'                        !< namelist parameter
     CHARACTER (LEN=20)   ::  bc_uv_t = 'dirichlet'                        !< namelist parameter
@@ -1180 +1182 @@
     INTEGER(iwp) ::  ibc_s_b                           !< integer flag for bc_s_b
     INTEGER(iwp) ::  ibc_s_t                           !< integer flag for bc_s_t
-    INTEGER(iwp) ::  ibc_sa_t                          !< integer flag for bc_sa_t
     INTEGER(iwp) ::  ibc_uv_b                          !< integer flag for bc_uv_b
     INTEGER(iwp) ::  ibc_uv_t                          !< integer flag for bc_uv_t
@@ -1242 +1243 @@
     INTEGER(iwp) ::  q_vertical_gradient_level_ind(10) = -9999   !< grid index values of q_vertical_gradient_level(s)
     INTEGER(iwp) ::  s_vertical_gradient_level_ind(10) = -9999   !< grid index values of s_vertical_gradient_level(s)   
-    INTEGER(iwp) ::  sa_vertical_gradient_level_ind(10) = -9999  !< grid index values of sa_vertical_gradient_level(s)
     INTEGER(iwp) ::  section(100,3)                              !< collective array for section_xy/xz/yz
     INTEGER(iwp) ::  section_xy(100) = -9999                     !< namelist parameter
@@ -1293 +1293 @@
     LOGICAL ::  constant_top_heatflux = .TRUE.                   !< heat flux at domain top constant?
     LOGICAL ::  constant_top_momentumflux = .FALSE.              !< momentum flux at domain topconstant?
-    LOGICAL ::  constant_top_salinityflux = .TRUE.               !< salinity flux at ocean domain top?
+    LOGICAL ::  constant_top_salinityflux = .TRUE.               !< constant salinity flux at ocean surface
     LOGICAL ::  constant_top_scalarflux = .TRUE.                 !< passive-scalar flux at domain top constant?
     LOGICAL ::  constant_scalarflux = .TRUE.                     !< passive-scalar flux at surfaces constant?
@@ -1328 +1328 @@
     LOGICAL ::  neutral = .FALSE.                                !< namelist parameter
     LOGICAL ::  nudging = .FALSE.                                !< namelist parameter
-    LOGICAL ::  ocean = .FALSE.                                  !< namelist parameter
+    LOGICAL ::  ocean_mode = .FALSE.                             !< namelist parameter
     LOGICAL ::  passive_scalar = .FALSE.                         !< namelist parameter
     LOGICAL ::  plant_canopy = .FALSE.                           !< switch for use of plant canopy model
@@ -1380 +1380 @@
                                                                !< (galilei transformation)
     REAL(wp) ::  alpha_surface = 0.0_wp                        !< namelist parameter
-    REAL(wp) ::  atmos_ocean_sign = 1.0_wp                     !< vertical-grid conversion factor 
+    REAL(wp) ::  atmos_ocean_sign = 1.0_wp                     !< vertical-grid conversion factor
                                                                !< (=1.0 in atmosphere, =-1.0 in ocean)
     REAL(wp) ::  averaging_interval = 0.0_wp                   !< namelist parameter
@@ -1454 +1454 @@
     REAL(wp) ::  particle_maximum_age = 9999999.9_wp           !< namelist parameter
     REAL(wp) ::  prandtl_number = 1.0_wp                       !< namelist parameter
-    REAL(wp) ::  prho_reference                                !< reference state of potential density
     REAL(wp) ::  pt_damping_factor = 0.0_wp                    !< namelist parameter
     REAL(wp) ::  pt_damping_width = 0.0_wp                     !< namelist parameter
@@ -1472 +1471 @@
     REAL(wp) ::  rho_surface                                   !< surface value of density
     REAL(wp) ::  roughness_length = 0.1_wp                     !< namelist parameter
-    REAL(wp) ::  sa_surface = 35.0_wp                          !< namelist parameter
     REAL(wp) ::  simulated_time = 0.0_wp                       !< elapsed simulated time
     REAL(wp) ::  simulated_time_at_begin                       !< elapsed simulated time of previous run (job chain)
@@ -1550 +1548 @@
     REAL(wp) ::  s_vertical_gradient(10) = 0.0_wp                  !< namelist parameter
     REAL(wp) ::  s_vertical_gradient_level(10) = -999999.9_wp    !< namelist parameter
-    REAL(wp) ::  sa_vertical_gradient(10) = 0.0_wp                 !< namelist parameter
-    REAL(wp) ::  sa_vertical_gradient_level(10) = -999999.9_wp   !< namelist parameter
     REAL(wp) ::  skip_time_domask(max_masks) = 9999999.9_wp        !< namelist parameter
     REAL(wp) ::  threshold(20) = 0.0_wp                            !< namelist parameter