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

Timestamp:

Jun 2, 2007 4:48:38 PM (17 years ago)

Author:

raasch

Message:

further preliminary uncomplete changes for ocean version

File:

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

palm/trunk/SOURCE/modules.f90

@@ -7 +7 @@
 ! +ocean, r, + salinity variables
 ! defaults of .._vertical_gradient_levels changed from -1.0 to -9999999.9
+! hydro_press renamed hyp
 !
 ! Former revisions:
@@ -94 +95 @@
 
     REAL, DIMENSION(:), ALLOCATABLE ::                                         &
-          ddzu, dd2zu, dzu, ddzw, dzw, km_damp_x, km_damp_y, l_grid, pt_init,  &
-          q_init, rdf, sa_init, ug, u_init, u_nzb_p1_for_vfc, vg, v_init,      &
-          v_nzb_p1_for_vfc, zu, zw
+          ddzu, dd2zu, dzu, ddzw, dzw, hyp, km_damp_x, km_damp_y, l_grid,      &
+          pt_init, q_init, rdf, sa_init, ug, u_init, u_nzb_p1_for_vfc, vg,     &
+          v_init, v_nzb_p1_for_vfc, zu, zw
 
     REAL, DIMENSION(:,:), ALLOCATABLE ::                                       &
@@ -102 +103 @@
 
     REAL, DIMENSION(:,:), ALLOCATABLE, TARGET ::                               &
-          qsws_1, qsws_2, qswst_1, qswst_2, rif_1, rif_2, saswst_1, shf_1,     &
-          shf_2, tswst_1, tswst_2, usws_1, usws_2, vsws_1, vsws_2
+          qsws_1, qsws_2, qswst_1, qswst_2, rif_1, rif_2, saswsb_1, saswst_1,  &
+          shf_1, shf_2, tswst_1, tswst_2, usws_1, usws_2, vsws_1, vsws_2
 
     REAL, DIMENSION(:,:), POINTER ::                                           &
-          qsws, qsws_m, qswst, qswst_m, rif, rif_m, saswst, shf, shf_m, tswst, &
-          tswst_m, usws, usws_m, vsws, vsws_m
+          qsws, qsws_m, qswst, qswst_m, rif, rif_m, saswsb, saswst, shf,       &
+          shf_m, tswst, tswst_m, usws, usws_m, vsws, vsws_m
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE ::                                     &
@@ -118 +119 @@
     REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET ::                             &
           e_1, e_2, e_3, kh_1, kh_2, km_1, km_2, p, pt_1, pt_2, pt_3, q_1,     &
-          q_2, q_3, ql_1, ql_2, r, sa_1, sa_2, sa_3, u_1, u_2, u_3, v_1, v_2,  &
-          v_3, vpt_1, vpt_2, w_1, w_2, w_3
+          q_2, q_3, ql_1, ql_2, rho, sa_1, sa_2, sa_3, u_1, u_2, u_3, v_1,     &
+          v_2, v_3, vpt_1, vpt_2, w_1, w_2, w_3
 
     REAL, DIMENSION(:,:,:), POINTER ::                                         &
@@ -167 +168 @@
               mass_of_solute, molecular_weight_of_solute,                      &
               prec_time_const = 0.001, ql_crit = 0.0005, rho_l = 1.0E3,        &
-              r_d = 287.0, r_v = 461.51, rho_surface,                          &
-              thermal_conductivity_l = 2.43E-2
-
-    REAL, DIMENSION(:), ALLOCATABLE :: hydro_press, pt_d_t, t_d_pt
+              r_d = 287.0, r_v = 461.51, thermal_conductivity_l = 2.43E-2
+
+    REAL, DIMENSION(:), ALLOCATABLE   ::  pt_d_t, t_d_pt
 
     REAL, DIMENSION(:,:), ALLOCATABLE ::  precipitation_amount, &
@@ -241 +241 @@
                             bc_q_b = 'dirichlet', bc_q_t = 'neumann', &
                             bc_s_b = 'dirichlet', bc_s_t = 'neumann', &
+                            bc_sa_t = 'neumann', &
                             bc_uv_b = 'dirichlet', bc_uv_t = 'dirichlet', &
                             dissipation_1d = 'as_in_3d_model', &
@@ -272 +273 @@
                 dvrp_filecount = 0, dz_stretch_level_index, gamma_mg, &
                 grid_level, ibc_e_b, ibc_p_b, ibc_p_t, ibc_pt_b, ibc_pt_t, &
-                ibc_q_b, ibc_q_t, ibc_uv_b, ibc_uv_t, &
+                ibc_q_b, ibc_q_t, ibc_sa_t, ibc_uv_b, ibc_uv_t, &
                 inflow_disturbance_begin = -1, inflow_disturbance_end = -1, &
                 intermediate_timestep_count, intermediate_timestep_count_max, &
@@ -302 +303 @@
                 conserve_volume_flow = .FALSE., constant_diffusion = .FALSE., &
                 constant_heatflux = .TRUE., constant_top_heatflux = .TRUE., &
+                constant_top_salinityflux = .TRUE., &
                 constant_waterflux = .TRUE., create_disturbances = .TRUE., &
                 cut_spline_overshoot = .TRUE., &
@@ -333 +335 @@
              averaging_interval = 0.0, averaging_interval_pr = 9999999.9, &
              averaging_interval_sp = 9999999.9, bc_pt_t_val, bc_q_t_val, &
+             bottom_salinityflux = 0.0, &
              building_height = 50.0, building_length_x = 50.0, &
              building_length_y = 50.0, building_wall_left = 9999999.9, &
@@ -363 +366 @@
              q_surface_initial_change = 0.0, rayleigh_damping_factor = -1.0, &
              rayleigh_damping_height = -1.0, residual_limit = 1.0E-4, &
-             restart_time = 9999999.9, rif_max = 1.0, rif_min = -5.0, &
-             roughness_length = 0.1, sa_surface = 35.0, simulated_time = 0.0, &
-             simulated_time_at_begin, sin_alpha_surface, &
+             restart_time = 9999999.9, rho_ref, rho_surface, rif_max = 1.0, &
+             rif_min = -5.0, roughness_length = 0.1, sa_surface = 35.0, &
+             simulated_time = 0.0, simulated_time_at_begin, sin_alpha_surface, &
              skip_time_data_output = 0.0, skip_time_data_output_av = 9999999.9,&
              skip_time_dopr = 9999999.9, skip_time_dosp = 9999999.9, &
@@ -380 +383 @@
              time_do_sla = 0.0, time_dvrp = 0.0, time_prel = 0.0, &
              time_restart = 9999999.9, time_run_control = 0.0, &
-             top_heatflux = 9999999.9, top_salinityflux = 0.0, &
+             top_heatflux = 9999999.9, top_salinityflux = 9999999.9, &
              ug_surface = 0.0, u_gtrans = 0.0, &
              ups_limit_e = 0.0, ups_limit_pt = 0.0, ups_limit_u = 0.0, &
@@ -393 +396 @@
              q_vertical_gradient_level(10) = -1.0, &
              s_vertical_gradient(10) = 0.0, &
-             s_vertical_gradient_level(10) = -1.0,
+             s_vertical_gradient_level(10) = -1.0, &
              sa_vertical_gradient(10) = 0.0, &
-             sa_vertical_gradient_level(10) = -1.0, threshold(20) = 0.0, &
+             sa_vertical_gradient_level(10) = -9999999.9, threshold(20) = 0.0, &
              tsc(10) = (/ 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 /), &
              ug_vertical_gradient(10) = 0.0, &