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

Timestamp:

Jun 1, 2007 3:25:22 PM (17 years ago)

Author:

raasch

Message:

preliminary uncomplete changes for ocean version

File:

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

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +ocean, r, + salinity variables
+! defaults of .._vertical_gradient_levels changed from -1.0 to -9999999.9
 !
 ! 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, ug, u_init, u_nzb_p1_for_vfc, vg, v_init,               &
+          q_init, rdf, sa_init, ug, u_init, u_nzb_p1_for_vfc, vg, v_init,      &
           v_nzb_p1_for_vfc, zu, zw
 
@@ -101 +102 @@
 
     REAL, DIMENSION(:,:), ALLOCATABLE, TARGET ::                               &
-          qsws_1, qsws_2, qswst_1, qswst_2, rif_1, rif_2, 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, 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, shf, shf_m, tswst,         &
+          qsws, qsws_m, qswst, qswst_m, rif, rif_m, saswst, shf, shf_m, tswst, &
           tswst_m, usws, usws_m, vsws, vsws_m
 
@@ -117 +118 @@
     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, 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, 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
 
     REAL, DIMENSION(:,:,:), POINTER ::                                         &
           e, e_m, e_p, kh, kh_m, km, km_m, pt, pt_m, pt_p, q, q_m, q_p, ql,    &
-          ql_c, te_m, tpt_m, tq_m, tu_m, tv_m, tw_m, u, u_m, u_p, v, v_m, v_p, &
-          vpt, vpt_m, w, w_m, w_p
+          ql_c, sa, sa_p, te_m, tpt_m, tq_m, tsa_m, tu_m, tv_m, tw_m, u, u_m,  &
+          u_p, v, v_m, v_p, vpt, vpt_m, w, w_m, w_p
 
     REAL, DIMENSION(:,:,:,:), ALLOCATABLE ::  rif_wall
@@ -288 +289 @@
                 pt_vertical_gradient_level_ind(10) = -9999, &
                 q_vertical_gradient_level_ind(10) = -9999, &
+                sa_vertical_gradient_level_ind(10) = -9999, &
                 section(100,3), section_xy(100) = -9999, &
                 section_xz(100) = -9999, section_yz(100) = -9999, &
@@ -312 +314 @@
                 mg_switch_to_pe0 = .FALSE., &
                 netcdf_output = .FALSE., netcdf_64bit = .FALSE., &
-                netcdf_64bit_3d = .TRUE., &
+                netcdf_64bit_3d = .TRUE., ocean = .FALSE., &
                 outflow_l = .FALSE., outflow_n = .FALSE., outflow_r = .FALSE., &
                 outflow_s = .FALSE., passive_scalar = .FALSE., &
@@ -362 +364 @@
              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, simulated_time = 0.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,&
@@ -378 +380 @@
              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, ug_surface = 0.0, u_gtrans = 0.0, &
+             top_heatflux = 9999999.9, top_salinityflux = 0.0, &
+             ug_surface = 0.0, u_gtrans = 0.0, &
              ups_limit_e = 0.0, ups_limit_pt = 0.0, ups_limit_u = 0.0, &
              ups_limit_v = 0.0, ups_limit_w = 0.0, vg_surface = 0.0, &
@@ -386 +389 @@
     REAL ::  do2d_xy_last_time(0:1) = -1.0, do2d_xz_last_time(0:1) = -1.0, &
              do2d_yz_last_time(0:1) = -1.0, pt_vertical_gradient(10) = 0.0, &
-             pt_vertical_gradient_level(10) = -1.0, &
+             pt_vertical_gradient_level(10) = -9999999.9, &
              q_vertical_gradient(10) = 0.0, &
              q_vertical_gradient_level(10) = -1.0, &
              s_vertical_gradient(10) = 0.0, &
-             s_vertical_gradient_level(10) = -1.0, threshold(20) = 0.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, &
              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, &