Changeset 305 for palm/trunk


Ignore:
Timestamp:
Apr 27, 2009 11:58:42 AM (15 years ago)
Author:
raasch
Message:

bugfix in Makefile, default value of grid_matching changed to strict

Location:
palm/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/DOC/app/chapter_4.1.html

    r256 r305  
    56665666
    56675667
    5668       <td style="vertical-align: top;"><span style="font-style: italic;">'match'</span></td>
     5668      <td style="vertical-align: top;"><span style="font-style: italic;">'strict'</span></td>
    56695669
    56705670
  • palm/trunk/DOC/app/chapter_4.6.html

    r266 r305  
    63526352     
    63536353     
    6354       <p><i>'match'</i></p>
     6354      <p><i>'strict'</i></p>
    63556355
    63566356
  • palm/trunk/SCRIPTS/mbuild

    r266 r305  
    105105     # 21/03/09 - Siggi - -u copies also copies process_dvr_output and
    106106     #                    .dvrserver.config
     107     # 21/04/09 - Siggi - adjustments for new IBM at DKRZ, which is now ibmh
    107108
    108109
     
    474475        (lcxt4)          remote_addres=129.177.20.113;;
    475476        (decalpha)       remote_addres=165.132.26.56;;
    476         (ibmb)           remote_addres=130.73.230.10;;
    477         (ibmh)           remote_addres=130.75.4.10;;
     477        (ibmh)           remote_addres=136.172.40.15;;
    478478        (ibms)           remote_addres=150.183.5.101;;
    479479        (ibmy)           remote_addres=165.132.26.58;;
     
    10841084                ssh  ${remote_username}@${remote_addres}  "cd ${remote_md}; echo '$make_call_string' > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" 2>&1 | tee ${remote_host}_last_make_protokoll
    10851085
    1086              elif [[ $remote_host = ibmb  ||  $remote_host = ibmh ]]
     1086             elif [[ $remote_host = ibmh ]]
    10871087             then
    10881088
     
    12281228                ssh  ${remote_username}@${remote_addres}  "cd ${remote_ud}; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR"
    12291229
    1230              elif [[ $remote_host = ibmb  ||  $remote_host = ibmh ]]
     1230             elif [[ $remote_host = ibmh ]]
    12311231             then
    12321232
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r292 r305  
    7070user_init_grid, user_parin, write_var_list)
    7171
     72Default value of grid_matching changed to strict.
     73
    7274advec_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
    7375
  • palm/trunk/SOURCE/Makefile

    r278 r305  
    116116        production_e.o prognostic_equations.o random_function.o random_gauss.o \
    117117        read_3d_binary.o read_var_list.o run_control.o \
    118         set_particle_attributes.o set_slicer_attributes_dvrp.f90 \
     118        set_particle_attributes.o set_slicer_attributes_dvrp.o \
    119119        singleton.o sor.o spline_x.o spline_y.o \
    120120        spline_z.o sum_up_3d_data.o surface_coupler.o swap_timelevel.o \
  • palm/trunk/SOURCE/flow_statistics.f90

    r291 r305  
    121121       sums_l(nzb+10,pr_palm,0) = sums_divnew_l(sr)  ! new divergence from pres
    122122
    123 !
     123! 
    124124!--    Horizontally averaged profiles of horizontal velocities and temperature.
    125125!--    They must have been computed before, because they are already required
  • palm/trunk/SOURCE/modules.f90

    r291 r305  
    1313! canyon_wall_south, conserve_volume_flow_mode, coupling_start_time,
    1414! dp_external, dp_level_b, dp_level_ind_b, dp_smooth, dp_smooth_factor, dpdxy,
    15 ! run_coupled, time_since_reference_point, u_bulk, v_bulk in control_parameters
     15! run_coupled, time_since_reference_point, u_bulk, v_bulk in control_parameters,
     16! default value of grid_matching changed to strict
    1617!
    1718! Former revisions:
     
    272273    CHARACTER (LEN=2)    ::  coupling_char = ''
    273274    CHARACTER (LEN=5)    ::  write_binary = 'false'
    274     CHARACTER (LEN=6)    ::  grid_matching = 'match'
     275    CHARACTER (LEN=6)    ::  grid_matching = 'strict'
    275276    CHARACTER (LEN=8)    ::  run_date, run_time
    276277    CHARACTER (LEN=9)    ::  simulated_time_chr
  • palm/trunk/SOURCE/set_slicer_attributes_dvrp.f90

    r285 r305  
    1616! This routine sets the dvrp-slicer attributes
    1717!------------------------------------------------------------------------------!
     18
    1819#if defined( __dvrp_graphics )
    1920
     
    5253
    5354#endif
     55
    5456 END SUBROUTINE set_slicer_attributes_dvrp
Note: See TracChangeset for help on using the changeset viewer.