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

Timestamp:

Jul 27, 2007 9:09:17 AM (17 years ago)

Author:

raasch

Message:

preliminary version for coupled runs

File:

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

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +comm_inter, coupling_char, coupling_mode, dt_coupling, ngp_xy, port_name,
+! time_coupling, type_xy, uswst*, vswst*
 !
 ! Former revisions:
@@ -107 +108 @@
     REAL, DIMENSION(:,:), ALLOCATABLE, TARGET ::                               &
           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
+          shf_1, shf_2, tswst_1, tswst_2, usws_1, usws_2, uswst_1, uswst_2,    &
+          vsws_1, vsws_2, vswst_1, vswst_2
 
     REAL, DIMENSION(:,:), POINTER ::                                           &
           qsws, qsws_m, qswst, qswst_m, rif, rif_m, saswsb, saswst, shf,       &
-          shf_m, tswst, tswst_m, usws, usws_m, vsws, vsws_m
+          shf_m, tswst, tswst_m, usws, uswst, usws_m, uswst_m, vsws, vswst,    &
+          vsws_m, vswst_m
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE ::                                     &
@@ -229 +232 @@
 
     CHARACTER (LEN=1)   ::  cycle_mg = 'w', timestep_reason = ' '
+    CHARACTER (LEN=2)   ::  coupling_char = ''
     CHARACTER (LEN=5)   ::  write_binary = 'false'
     CHARACTER (LEN=6)   ::  grid_matching = 'match'
@@ -246 +250 @@
                             bc_sa_t = 'neumann', &
                             bc_uv_b = 'dirichlet', bc_uv_t = 'dirichlet', &
+                            coupling_mode = 'uncoupled', &
                             dissipation_1d = 'as_in_3d_model', &
                             fft_method = 'system-specific', &
@@ -348 +353 @@
              disturbance_level_t = -9999999.9, &
              dt = -1.0, dt_averaging_input = 0.0, &
-             dt_averaging_input_pr = 9999999.9, dt_data_output = 9999999.9, &
+             dt_averaging_input_pr = 9999999.9, dt_coupling = 9999999.9, &
+             dt_data_output = 9999999.9, &
              dt_data_output_av = 9999999.9, dt_disturb = 9999999.9, &
              dt_dopr = 9999999.9, dt_dopr_listing = 9999999.9, &
@@ -382 +388 @@
              surface_scalarflux = 0.0, surface_waterflux = 0.0, &
              s_surface = 0.0, s_surface_initial_change = 0.0, &
-             termination_time_needed = -1.0, time_disturb = 0.0, &
+             termination_time_needed = -1.0, time_coupling = 0.0, &
+             time_disturb = 0.0, &
              time_dopr = 0.0, time_dopr_av = 0.0, time_dopr_listing = 0.0, &
              time_dopts = 0.0, time_dosp = 0.0, time_dosp_av = 0.0, &
@@ -389 +396 @@
              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 = 9999999.9, &
+             top_heatflux = 9999999.9, top_momentumflux_u = 0.0, &
+             top_momentumflux_v = 0.0, 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, &
@@ -916 +924 @@
 
 #if defined( __parallel )
-    INTEGER ::  comm1dx, comm1dy, comm2d, comm_palm, ierr, myidx, myidy,       &
-                ndim = 2, ngp_y, pleft, pnorth, pright, psouth,                &
+#if defined( __mpi2 )
+    CHARACTER (LEN=MPI_MAX_PORT_NAME) ::  port_name
+#endif
+
+    INTEGER ::  comm1dx, comm1dy, comm2d, comm_inter, comm_palm, ierr, myidx,  &
+                myidy, ndim = 2, ngp_xy, ngp_y, pleft, pnorth, pright, psouth, &
                 sendrecvcount_xy, sendrecvcount_yz, sendrecvcount_zx,          &
                 sendrecvcount_zyd, sendrecvcount_yxd,                          &
-                type_x, type_x_int, ibuf(12), pcoord(2), pdims(2),             &
-                status(MPI_STATUS_SIZE)
+                type_x, type_x_int, type_xy
+
+    INTEGER ::  ibuf(12), pcoord(2), pdims(2), status(MPI_STATUS_SIZE)
 
     INTEGER, DIMENSION(:), ALLOCATABLE ::  ngp_yz, type_xz