Changeset 377


Ignore:
Timestamp:
Sep 4, 2009 11:09:00 AM (12 years ago)
Author:
raasch
Message:

adjustments for openmp usage on sgi-ice

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r376 r377  
    293293 transfer_problems=false
    294294 usern=$LOGNAME
     295 use_openmp=false
    295296 working_directory=`pwd`
    296297 TOPT=""
     
    11361137       tasks_per_node=1
    11371138    fi
     1139
     1140       # SETTINGS FOR SUBJOB-COMMAND
     1141    if [[ $(echo $host | cut -c1-5) = lcsgi ]]
     1142    then
     1143       (( tp1 = tasks_per_node * threads_per_task ))
     1144       TOPT="-T $tp1"
     1145    else
     1146       TOPT="-T $tasks_per_node"
     1147    fi
    11381148    OOPT="-O $threads_per_task"
    1139     TOPT="-T $tasks_per_node"
    11401149
    11411150       # GESAMTZAHL DER KNOTEN BESTIMMEN
     
    31683177                          # export MPI_DSM_DISTRIBUTE=1
    31693178                          # MPI_DSM_CPULIST: pin MPI processes to cores
    3170                       export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
     3179                      if [[ $use_openmp = false ]]
     3180                      then
     3181                         export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts"
     3182                      fi
    31713183                          # MPI_IB_RAILS: use both IB rails on ICE2
    31723184                      export MPI_BUFS_PER_HOST=512
  • palm/trunk/SCRIPTS/subjob

    r376 r377  
    498498 if (( tasks_per_node != 0 ))
    499499 then
    500     (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
     500    if [[ $(echo $remote_host | cut -c1-5) = lcsgi ]]
     501    then
     502       (( nodes = numprocs / tasks_per_node ))
     503    else
     504       (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
     505    fi
    501506 fi
    502507
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r376 r377  
    5757New: set_particle_attributes, set_slicer_attributes_dvrp
    5858
     59
    5960Changed:
    6061-------
     62__lcmuk changed to __lc to avoid problems with Intel compiler on sgi-ice
     63(poisfft)
     64
    6165For extended NetCDF files, the updated title attribute includes an update of
    6266time_average_text where appropriate. (netcdf)
     
    116120for coupled runs on ibmy (mrun, subjob)
    117121
    118 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
     122advec_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, 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
    119123
    120124
  • palm/trunk/SOURCE/poisfft.f90

    r198 r377  
    44! Actual revisions:
    55! -----------------
    6 !
     6! __lcmuk changed to __lc to avoid problems with Intel compiler on sgi-ice
    77!
    88! Former revisions:
     
    13611361
    13621362       IF ( j <= nnyh )  THEN
    1363 #if defined( __lcmuk )
     1363#if defined( __lc )
    13641364          CALL maketri_1dd( j, tri )
    13651365#else
     
    13671367#endif
    13681368       ELSE
    1369 #if defined( __lcmuk )
     1369#if defined( __lc )
    13701370          CALL maketri_1dd( ny+1-j, tri )
    13711371#else
     
    13731373#endif
    13741374       ENDIF
    1375 #if defined( __lcmuk )
     1375#if defined( __lc )
    13761376       CALL split_1dd( tri )
    13771377#else
     
    13821382    CONTAINS
    13831383
    1384 #if defined( __lcmuk )
     1384#if defined( __lc )
    13851385       SUBROUTINE maketri_1dd( j, tri )
    13861386#else
     
    14011401          REAL, DIMENSION(0:nx) ::  l
    14021402
    1403 #if defined( __lcmuk )
     1403#if defined( __lc )
    14041404          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
    14051405#endif
     
    14481448
    14491449
    1450 #if defined( __lcmuk )
     1450#if defined( __lc )
    14511451       SUBROUTINE split_1dd( tri )
    14521452#else
     
    14621462          INTEGER ::  i, k
    14631463
    1464 #if defined( __lcmuk )
     1464#if defined( __lc )
    14651465          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
    14661466#endif
Note: See TracChangeset for help on using the changeset viewer.