Changeset 2011 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Sep 19, 2016 5:29:57 PM (8 years ago)

Author:

kanani

Message:

changes related to steering and formating of urban surface model

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (4 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Flag urban_surface is now defined in module control_parameters,
+! removed commented CALLs of global_min_max.
 ! 
 ! Former revisions:
@@ -275 +276 @@
                time_dots, time_do_av, time_do_sla, time_disturb, time_dvrp,    &
                time_run_control, time_since_reference_point,                   &
-               turbulent_inflow, use_initial_profile_as_reference,             &
+               turbulent_inflow, urban_surface,                                &
+               use_initial_profile_as_reference,                               &
                use_single_reference_value, u_gtrans, v_gtrans, virtual_flight, &
                ws_scheme_mom, ws_scheme_sca
@@ -346 +348 @@
 
     USE urban_surface_mod,                                                     &
-        ONLY:  urban_surface, usm_material_heat_model, usm_material_model,     &
+        ONLY:  usm_material_heat_model, usm_material_model,     &
                usm_radiation, usm_surface_energy_balance              
 
@@ -1211 +1213 @@
             timestep_scheme(1:5) /= 'runge'  .OR.  disturbance_created ) &
        THEN
-!          IF ( current_timestep_number == 1 )  THEN
-!             IF ( nxl < 7 .AND.  nxr > 7 .AND. nys < 7 .AND. nyn > 7 )  THEN
-!                u(10,7,7) = 0.55
-!             ENDIF
-!             PRINT*, 'calculating minmax'
-!             CALL global_min_max( nzb, nzt+1, nysg, nyng, nxlg, nxrg, u,       &
-!                                  'abs', 0.0_wp, u_max, u_max_ijk )
-!             CALL global_min_max( nzb, nzt+1, nysg, nyng, nxlg, nxrg, v,       &
-!                                  'abs', 0.0_wp, v_max, v_max_ijk )
-!             CALL global_min_max( nzb, nzt+1, nysg, nyng, nxlg, nxrg, w,       &
-!                                  'abs', 0.0_wp, w_max, w_max_ijk )
-!             PRINT*, 'calculated u_max = ', u_max, '  myid = ', myid
-!          ENDIF
           CALL run_control
           IF ( time_run_control >= dt_run_control )  THEN