Changeset 367


Ignore:
Timestamp:
Aug 25, 2009 8:35:52 AM (12 years ago)
Author:
maronga
Message:

adapted for machine lck

Location:
palm/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r366 r367  
    106106     #                    .dvrserver.config
    107107     # 21/04/09 - Siggi - adjustments for new IBM at DKRZ, which is now ibmh
     108     # 25/08/09 - BjornM- adapted for lck
    108109
    109110
     
    472473        (lcsgib)         remote_addres=130.73.232.102;;
    473474        (lcsgih)         remote_addres=130.75.4.102;;
     475        (lck)            remote_addres=165.132.26.61;;
    474476        (lctit)          remote_addres=172.17.75.161;;
    475477        (lcxt4)          remote_addres=129.177.20.113;;
  • palm/trunk/SCRIPTS/mrun

    r366 r367  
    187187     # 19/08/09 - Marcus - MPI debug option
    188188     # 21/08/09 - Marcus - totalview on hice/bice also available for mvapich2
     189     # 25/08/09 - BjornM - adpated for lck
    189190
    190191 
     
    634635    do_remote=true
    635636    case  $host  in
    636         (ibm|ibmb|ibmh|ibms|ibmy|nech|necriam|lcsgib|lcsgih|lctit|unics|lcxt4)  true;;
     637        (ibm|ibmb|ibmh|ibms|ibmy|nech|necriam|lcsgib|lcsgih|lctit|unics|lcxt4|lck)  true;;
    637638        (*)  printf "\n"
    638639             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
     
    809810                   do_remote=true
    810811                   case  $host  in
    811                        (ibm|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4)  true;;
     812                       (ibm|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4|lck)  true;;
    812813                       (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
    813814                            printf "\n      is not available"
     
    10641065    do_remote=true
    10651066    case  $host  in
    1066         (ibm|ibmb|ibmh|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4)  true;;
     1067        (ibm|ibmb|ibmh|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4|lck)  true;;
    10671068        (*)  printf "\n"
    10681069             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
     
    19841985 lopts="$lopts $netcdf_lib $dvr_lib"
    19851986 ROPTS="$ropts"
    1986  if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcxt4 )  &&  -n $numprocs ]]
     1987 if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcxt4 || $host = lck )  &&  -n $numprocs ]]
    19871988 then
    19881989    XOPT="-X $numprocs"
     
    32523253                      aprun  -n $ii  -N $tasks_per_node  a.out < runfile_atmos  $ROPTS
    32533254
     3255                   elif [[ $host = lck ]]
     3256                   then
     3257                         mpiexec -n $ii  ./a.out  $ROPTS < runfile_atmos &
    32543258                   fi
    32553259                   wait
  • palm/trunk/SCRIPTS/subjob

    r366 r367  
    103103     # 20/07/09 - Siggi - On lcsgi, jobs for returning the job protocol are
    104104     #                    now run on the data nodes (feature=data)
    105 
     105     # 25/08/09 - BjornM- adapted for lck
    106106
    107107    # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
     
    179179     (elephanta)             local_addres=130.75.105.6;   local_host=lcmuk;;
    180180     (fimm.bccs.uib.no)      local_addres=172.20.4.2;     local_host=lcfimm;;
     181     (node*)                 local_addres=165.132.26.61   local_host=lck;;
    181182     (gallego)               local_addres=130.75.105.10;  local_host=lcmuk;;
    182183     (gfdl5)                 local_addres=165.132.26.58;  local_host=ibmy;;
     
    330331        (lcsgib)  queue=smallq; remote_addres=130.73.232.103; submcom=/opt/moab/bin/msub;;
    331332        (lcsgih)  queue=smallq; remote_addres=130.75.4.102; submcom=/opt/moab/bin/msub;;
     333        (lck)     remote_addres=165.132.26.61; submcom=/usr/torque/bin/qsub;;
    332334        (lctit)   queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
    333335        (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
     
    11991201       then
    12001202          eval  $submcom  $job_on_remhost
    1201        elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4 ]]
     1203       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4 || $localhost = lck ]]
    12021204       then
    12031205          eval  $submcom  $job_on_remhost
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r366 r367  
    11New:
    22---
     3
     4Adapted for machine lck
     5(mrun, mbuild, subjob)
     6
    37bc_lr/bc_ns  in most subroutines replaced by LOGICAL variables bc_lr_cyc,
    48bc_ns_cyc for speed optimization
     
    4953
    5054
    51 average_3d_data, 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_3d_binary, 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_3d_binary, write_var_list
     55average_3d_data, 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, mbuild, modules, mrun, package_parin, parin, prognostic_equations, read_3d_binary, read_var_list, subjob, surface_coupler, timestep, time_integration, user_check_parameters, user_data_output_2d, user_data_output_dvrp, user_header, user_init_grid, write_3d_binary, write_var_list
    5256
    5357New: set_particle_attributes, set_slicer_attributes_dvrp
  • palm/trunk/SOURCE/average_3d_data.f90

    r354 r367  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Added calculation of shf* and qsws*
    77!
    88! Former revisions:
     
    129129                ENDDO
    130130             ENDDO
    131              
     131
    132132          CASE ( 'ql' )
    133133             DO  i = nxl-1, nxr+1
     
    175175                ENDDO
    176176             ENDDO
    177          
     177
    178178          CASE ( 'rho' )
    179179             DO  i = nxl-1, nxr+1
     
    184184                ENDDO
    185185             ENDDO
    186              
     186
    187187          CASE ( 's' )
    188188             DO  i = nxl-1, nxr+1
     
    193193                ENDDO
    194194             ENDDO
    195              
     195
    196196          CASE ( 'sa' )
    197197             DO  i = nxl-1, nxr+1
     
    202202                ENDDO
    203203             ENDDO
    204              
     204
    205205         CASE ( 'shf*' )
    206206             DO  i = nxl-1, nxr+1
     
    209209                ENDDO
    210210             ENDDO
    211              
     211
    212212          CASE ( 't*' )
    213213             DO  i = nxl-1, nxr+1
  • palm/trunk/SOURCE/check_parameters.f90

    r366 r367  
    1313! topography_grid_convention moved from user_check_parameters
    1414! 'single_street_canyon'
     15! Added shf* and qsws* to the list of available output data
    1516!
    1617! Former revisions:
  • palm/trunk/SOURCE/data_output_2d.f90

    r355 r367  
    1010! Output of user defined 2D (XY) arrays at z=nzb+1 is now possible
    1111! Bugfix: to_be_resorted => s_av for time-averaged scalars
    12 !
     12! Calculation of shf* and qsws* added.
    1313!
    1414! Former revisions:
  • palm/trunk/SOURCE/modules.f90

    r366 r367  
    2020! run_coupled, time_since_reference_point, u_bulk, v_bulk in control_parameters,
    2121! default value of grid_matching changed to strict
     22! +shf_av, qsws_av
    2223!
    2324! Former revisions:
  • palm/trunk/SOURCE/read_3d_binary.f90

    r354 r367  
    55! -----------------
    66! Output of messages replaced by message handling routine.
    7 !
     7! +shf_av, qsws_av
    88!
    99! Former revisions:
  • palm/trunk/SOURCE/sum_up_3d_data.f90

    r354 r367  
    44! Actual revisions:
    55! -----------------
    6 !
     6! +shf*, qsws*
    77!
    88! Former revisions:
  • palm/trunk/SOURCE/write_3d_binary.f90

    r354 r367  
    44! Actual revisions:
    55! -----------------
    6 !
     6! +shf_av, qsws_av
    77!
    88! Former revisions:
Note: See TracChangeset for help on using the changeset viewer.