Changeset 329


Ignore:
Timestamp:
Jun 2, 2009 2:16:11 PM (13 years ago)
Author:
heinze
Message:

Small change in formatting in message.f90. Bugfix in cross_sections.ncl in case of normalizing.

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/NCL/cross_sections.ncl

    r286 r329  
    10191019
    10201020   if (xyc .EQ. 1) then
    1021       d=(ye-ys+1)/(major_ticks_y-1)
     1021      d= (ye-ys+1)/(major_ticks_y-1)
    10221022      e=(xe-xs+1)/(major_ticks_x-1)
    10231023      array_yl       =new(major_ticks_y,integer)
     
    10361036         if (ar .GT. 0)
    10371037            do min_ar=0,3
    1038                array_minor_yl(4*(ar-1)+min_ar)= int2dble(array_yl(ar-1))+int2dble(array_yl(ar)-array_yl(ar-1))/5*(min_ar+1)
     1038                array_minor_yl(4*(ar-1)+min_ar)= y_d(array_yl(ar-1))+(y_d(array_yl(ar))-y_d(array_yl(ar-1)))/5*(min_ar+1)
    10391039            end do
    10401040         end if 
     
    10451045         if (br .GT. 0)
    10461046            do min_br=0,3
    1047                array_minor_xb(4*(br-1)+min_br)= int2dble(array_xb(br-1))+int2dble(array_xb(br)-array_xb(br-1))/5*(min_br+1)
     1047               array_minor_xb(4*(br-1)+min_br)= x_d(array_xb(br-1))+(x_d(array_xb(br))-x_d(array_xb(br-1)))/5*(min_br+1)
    10481048            end do
    10491049         end if
     
    10691069         if (ar .GT. 0)
    10701070            do min_ar=0,3
    1071                array_minor_yl(4*(ar-1)+min_ar)= int2dble(array_yl(ar-1))+int2dble(array_yl(ar)-array_yl(ar-1))/5*(min_ar+1)
     1071               array_minor_yl(4*(ar-1)+min_ar)= z_d(array_yl(ar-1))+(z_d(array_yl(ar))-z_d(array_yl(ar-1)))/5*(min_ar+1)
    10721072            end do
    10731073         end if 
     
    10781078         if (br .GT. 0)
    10791079            do min_br=0,3
    1080                array_minor_xb(4*(br-1)+min_br)= int2dble(array_xb(br-1))+int2dble(array_xb(br)-array_xb(br-1))/5*(min_br+1)
     1080               array_minor_xb(4*(br-1)+min_br)= x_d(array_xb(br-1))+(x_d(array_xb(br))-x_d(array_xb(br-1)))/5*(min_br+1)
    10811081            end do
    10821082         end if
     
    10991099      do ar=1,major_ticks_y-1
    11001100         array_yl(ar)=d*(ar-1)+d-1
    1101          array_yl_labels(ar) = y_d(array_yl(ar))
     1101         array_yl_labels(ar) = z_d(array_yl(ar))
    11021102         if (ar .GT. 0)
    11031103            do min_ar=0,3
    1104                array_minor_yl(4*(ar-1)+min_ar)= int2dble(array_yl(ar-1))+int2dble(array_yl(ar)-array_yl(ar-1))/5*(min_ar+1)
     1104               array_minor_yl(4*(ar-1)+min_ar)= z_d(array_yl(ar-1))+(z_d(array_yl(ar))-z_d(array_yl(ar-1)))/5*(min_ar+1)
    11051105            end do
    11061106         end if 
     
    11081108      do br=1,major_ticks_x-1
    11091109         array_xb(br)=e*(br-1)+e-1
    1110          array_xb_labels(br) = x_d(array_xb(br))
     1110         array_xb_labels(br) = y_d(array_xb(br))
    11111111         if (br .GT. 0)
    11121112            do min_br=0,3
    1113                array_minor_xb(4*(br-1)+min_br)= int2dble(array_xb(br-1))+int2dble(array_xb(br)-array_xb(br-1))/5*(min_br+1)
     1113               array_minor_xb(4*(br-1)+min_br)= y_d(array_xb(br-1))+(y_d(array_xb(br))-y_d(array_xb(br-1)))/5*(min_br+1)
    11141114            end do
    11151115         end if
    11161116      end do
    11171117   end if
    1118 
     1118 
    11191119   if (axes_explicit .EQ. 1)then
    11201120      cs_res@tmYLMode = "Explicit"
    11211121      cs_res@tmXBMode = "Explicit"
    1122       cs_res@tmYLValues = array_yl
    1123       if (xyc .EQ. 1)then
     1122      if (xyc .EQ. 1)then
     1123         cs_res@tmYLValues = y_d(array_yl)
     1124         cs_res@tmXBValues = x_d(array_xb)     
    11241125         cs_res@tmYLLabels = array_yl_labels/norm_y
    11251126         cs_res@tmXBLabels = array_xb_labels/norm_x
     
    11361137      end if
    11371138      if (xzc .EQ. 1)then
     1139         cs_res@tmYLValues = z_d(array_yl)
     1140         cs_res@tmXBValues = x_d(array_xb) 
    11381141         cs_res@tmYLLabels = array_yl_labels/norm_z
    11391142         cs_res@tmXBLabels = array_xb_labels/norm_x
     
    11501153      end if
    11511154      if (yzc .EQ. 1)then
     1155         cs_res@tmYLValues = z_d(array_yl)
     1156         cs_res@tmXBValues = y_d(array_xb) 
    11521157         cs_res@tmYLLabels = array_yl_labels/norm_z
    11531158         cs_res@tmXBLabels = array_xb_labels/norm_y
     
    11631168         end if
    11641169      end if
    1165       cs_res@tmXBValues = array_xb     
    11661170      cs_res@tmYLMinorValues = array_minor_yl
    11671171      cs_res@tmXBMinorValues = array_minor_xb
     
    13011305            temp = f[:]->$vNam(varn)$
    13021306            data_att = f_att->$vNam(varn)$
    1303             data(varn,:,:,:,:)=temp(:,zs:ze,ys:ye,xs:xe)               
     1307            if(vNam(varn) .eq. "ts_xy" .or. vNam(varn) .eq. "us_xy" .or. vNam(varn) .eq. "z0s_xy")
     1308              ;these variables depend von zu1_xy and that's why they have only one z-layer
     1309              data(varn,:,0,:,:)=temp(:,0,ys:ye,xs:xe)
     1310            else
     1311              data(varn,:,:,:,:)=temp(:,zs:ze,ys:ye,xs:xe)
     1312            end if
     1313            delete(temp)               
    13041314         end if
    13051315         if ( xzc .eq. 1 ) then
     
    13301340         
    13311341         unit(varn) = data_att@units
     1342         delete(data_att)
    13321343
    13331344      end if
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r328 r329  
    4343Changed:
    4444-------
     45Small change in formatting of the message handling routine concering the output in the
     46job protocoll. (message)
     47
    4548initializing_actions='read_data_for_recycling' renamed to 'cyclic_fill', now
    4649independent of turbulent_inflow (check_parameters, header, init_3d_model)
     
    8588Default value of grid_matching changed to strict.
    8689
    87 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, 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
     90advec_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
    8891
    8992
  • palm/trunk/SOURCE/message.f90

    r311 r329  
    138138          WRITE( file_id, '(4X,A)' )  TRIM( information_string_1 )
    139139          WRITE( file_id, '(4X,A)' )  TRIM( information_string_2 )
     140          WRITE( *, '(4X,A)' )  ''
    140141!
    141142!--       Flush buffer, if requested
Note: See TracChangeset for help on using the changeset viewer.