Changeset 343 for palm/trunk/SOURCE

Timestamp:

Jun 24, 2009 12:59:09 PM (16 years ago)

Author:

maronga

Message:

adjustments for lcxt4 and ibmy, allow user 2d xy cross section output at z=nzb+1

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (2 diffs)
• check_parameters.f90 (modified) (1 diff)
• data_output_2d.f90 (modified) (3 diffs)
• flow_statistics.f90 (modified) (3 diffs)
• modules.f90 (modified) (4 diffs)
• time_integration.f90 (modified) (2 diffs)
• timestep.f90 (modified) (2 diffs)
• user_data_output_2d.f90 (modified) (3 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -37 +37 @@
 write_var_list)
 
-check_for_restart, check_parameters, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_ptseries, data_output_spectra, data_output_tseries, init_coupling, init_dvrp, init_grid, init_3d_model, header, modules, mrun, package_parin, parin, prognostic_equations, read_var_list, surface_coupler, timestep, time_integration, user_check_parameters, user_data_output_dvrp, user_header, user_init_grid, write_var_list
+Option for user defined 2D data output in xy cross sections at z=nzb+1
+(data_output_2d, user_data_output_2d)
+
+check_for_restart, check_parameters, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_ptseries, data_output_spectra, data_output_tseries, init_coupling, init_dvrp, init_grid, init_3d_model, header, modules, mrun, package_parin, parin, prognostic_equations, read_var_list, surface_coupler, timestep, time_integration, user_check_parameters, user_data_output_2d, user_data_output_dvrp, user_header, user_init_grid, write_var_list
 
 New: set_particle_attributes, set_slicer_attributes_dvrp
@@ -91 +94 @@
 Default value of grid_matching changed to strict.
 
-advec_particles, advec_s_bc, buoyancy, calc_spectra, check_for_restart, check_open, check_parameters, close_file, coriolis, cpu_log, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_ptseries, data_output_spectra, data_output_tseries, eqn_state_seawater, fft_xy, flow_statistics, header, init_1d_model, init_3d_model, init_dvrp, init_grid, init_particles, init_pegrid, message, netcdf, output_particles_netcdf, package_parin, parin, plant_canopy_model, poisfft_hybrid, poismg, read_3d_binary, read_var_list, sort_particles, user_check_parameters, user_header, user_init_grid, user_parin, surface_coupler, temperton_fft, timestep, user_actions, user_data_output_dvrp, user_dvrp_coltab, user_init_grid, user_init_plant_canopy, user_parin, user_read_restart_data, user_spectra, write_var_list
+Adjustments for runs on lcxt4 (necessary due to an software update on CRAY) and 
+for coupled runs on ibmy (mrun, subjob)
+
+advec_particles, advec_s_bc, buoyancy, calc_spectra, check_for_restart, check_open, check_parameters, close_file, coriolis, cpu_log, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_ptseries, data_output_spectra, data_output_tseries, eqn_state_seawater, fft_xy, flow_statistics, header, init_1d_model, init_3d_model, init_dvrp, init_grid, init_particles, init_pegrid, message, mrun, netcdf, output_particles_netcdf, package_parin, parin, plant_canopy_model, poisfft_hybrid, poismg, read_3d_binary, read_var_list, sort_particles, subjob, user_check_parameters, user_header, user_init_grid, user_parin, surface_coupler, temperton_fft, timestep, user_actions, user_data_output_dvrp, user_dvrp_coltab, user_init_grid, user_init_plant_canopy, user_parin, user_read_restart_data, user_spectra, write_var_list
 
 

palm/trunk/SOURCE/check_parameters.f90

@@ -391 +391 @@
     ELSEIF ( TRIM( coupling_mode ) == 'uncoupled'  .AND.  &
              TRIM( coupling_char ) == '_O' )  THEN
+
 !
 !--    Check whether an (uncoupled) atmospheric run has been declared as an
 !--    ocean run (this setting is done via mrun-option -y)
+
        message_string = 'ocean = .F. does not allow coupling_char = "' // &
                         TRIM( coupling_char ) // '" set by mrun-option "-y"'

palm/trunk/SOURCE/data_output_2d.f90

@@ -8 +8 @@
 ! Bugfix: averaging along z is not allowed for 2d quantities (e.g. u* and z0)
 ! Output of messages replaced by message handling routine.
+! Output of user defined 2D (XY) arrays at z=nzb+1 is now possible
 !
 !
@@ -512 +513 @@
 !--             User defined quantity
                 CALL user_data_output_2d( av, do2d(av,if), found, grid, &
-                                          local_pf )
+                                          local_pf, two_d )
                 resorted = .TRUE.
 
@@ -519 +520 @@
                 ELSEIF ( grid == 'zw' )  THEN
                    IF ( mode == 'xy' )  level_z = zw
+                ELSEIF ( grid == 'zu1' ) THEN
+                   IF ( mode == 'xy' )  level_z(nzb+1) = zu(nzb+1)
                 ENDIF
 

palm/trunk/SOURCE/flow_statistics.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! Added missing timeseries calculation of w"q"(0), moved timeseries q* to the
+! end.
 ! Temperature gradient criterion for estimating the boundary layer height
 ! replaced by the gradient criterion of Sullivan et al. (1998).
@@ -1025 +1027 @@
        ts_value(19,sr) = hom(nzb+1,1,pr_palm,sr)    ! u'w'    at k=0
        ts_value(20,sr) = hom(nzb+2,1,pr_palm,sr)    ! v'w'    at k=0
-       ts_value(21,sr) = hom(nzb+12,1,pr_palm,sr)   ! q*
+       ts_value(21,sr) = hom(nzb,1,48,sr)           ! w"q"    at k=0
 
        IF ( ts_value(5,sr) /= 0.0 )  THEN
@@ -1034 +1036 @@
        ENDIF
 
+       ts_value(23,sr) = hom(nzb+12,1,pr_palm,sr)   ! q*
 !
 !--    Calculate additional statistics provided by the user interface

palm/trunk/SOURCE/modules.f90

@@ -3 +3 @@
 
 !------------------------------------------------------------------------------!
-! Actual revisions:
+! Current revisions:
 ! -----------------
+! translation error of actual -> current revisions fixed
+! +q* in dots_label, dots_unit. increased dots_num respectively
 ! typographical error in dots_unit fixed
 ! +clip_dvrp_*, cluster_size, color_interval, dvrpsize_interval, dvrp_overlap,
@@ -824 +826 @@
                            replace_num = 6
 
-    INTEGER ::  dots_num = 22
+    INTEGER ::  dots_num = 23
 
     CHARACTER, DIMENSION( replace_num ) :: &
@@ -856 +858 @@
              'vmax   ', 'wmax   ', 'div_new', 'div_old', 'z_i_wpt', 'z_i_pt ', &
              'w*     ', 'w"pt"0 ', 'w"pt"  ', 'wpt    ', 'pt(0)  ', 'pt(zp) ', &
-             'w"u"0  ', 'w"v"0  ', 'w"q"0  ', 'mo_L   ',                       &
-             ( 'unknown', i9 = 1, 78) /)
+             'w"u"0  ', 'w"v"0  ', 'w"q"0  ', 'mo_L   ', 'q*     ',            &
+             ( 'unknown', i9 = 1, 77) /)
 
     CHARACTER (LEN=7), DIMENSION(dots_max) :: dots_unit = &
@@ -863 +865 @@
              'm/s    ', 'm/s    ', 's-1    ', 's-1    ', 'm      ', 'm      ', &
              'm/s    ', 'K m/s  ', 'K m/s  ', 'K m/s  ', 'K      ', 'K      ', &
-             'm2/s2  ', 'm2/s2  ', 'kg m/s ', 'm      ',                       &
-             ( 'unknown', i9 = 1, 78 ) /)
+             'm2/s2  ', 'm2/s2  ', 'kg m/s ', 'm      ', 'kg/kg  ',            &
+             ( 'unknown', i9 = 1, 77 ) /)
 
     CHARACTER (LEN=7), DIMENSION(300) ::  dopr_unit = 'unknown'

palm/trunk/SOURCE/time_integration.f90

@@ -116 +116 @@
 !--    Determine size of next time step
        IF ( simulated_time /= 0.0 )  CALL timestep
-
 !
 !--    Execute the user-defined actions
@@ -334 +333 @@
        IF ( coupling_mode /= 'uncoupled'  .AND.  run_coupled )  THEN
           time_coupling = time_coupling + dt_3d
+
 !
 !--       In case of model termination initiated by the local model 

palm/trunk/SOURCE/timestep.f90

@@ -55 +55 @@
     REAL, DIMENSION(2)         ::  uv_gtrans, uv_gtrans_l
     REAL, DIMENSION(nzb+1:nzt) ::  dxyz2_min
-
 
     CALL cpu_log( log_point(12), 'calculate_timestep', 'start' )
@@ -385 +384 @@
 
     ENDIF
-
     CALL cpu_log( log_point(12), 'calculate_timestep', 'stop' )
 
-
  END SUBROUTINE timestep

palm/trunk/SOURCE/user_data_output_2d.f90

@@ -1 @@
- SUBROUTINE user_data_output_2d( av, variable, found, grid, local_pf )
+ SUBROUTINE user_data_output_2d( av, variable, found, grid, local_pf, two_d )
 
 !------------------------------------------------------------------------------!
@@ -29 +29 @@
     INTEGER ::  av, i, j, k
 
-    LOGICAL ::  found
+    LOGICAL ::  found, two_d
 
     REAL, DIMENSION(nxl-1:nxr+1,nys-1:nyn+1,nzb:nzt+1) ::  local_pf
@@ -64 +64 @@
 !          grid = 'zu'
 
+
        CASE DEFAULT
           found = .FALSE.