Changeset 367 for palm

Timestamp:

Aug 25, 2009 8:35:52 AM (15 years ago)

Author:

maronga

Message:

adapted for machine lck

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (2 diffs)
• SCRIPTS/mrun (modified) (6 diffs)
• SCRIPTS/subjob (modified) (4 diffs)
• SOURCE/CURRENT_MODIFICATIONS (modified) (2 diffs)
• SOURCE/average_3d_data.f90 (modified) (7 diffs)
• SOURCE/check_parameters.f90 (modified) (1 diff)
• SOURCE/data_output_2d.f90 (modified) (1 diff)
• SOURCE/modules.f90 (modified) (1 diff)
• SOURCE/read_3d_binary.f90 (modified) (1 diff)
• SOURCE/sum_up_3d_data.f90 (modified) (1 diff)
• SOURCE/write_3d_binary.f90 (modified) (1 diff)

palm/trunk/SCRIPTS/mbuild

@@ -106 +106 @@
      #                    .dvrserver.config
      # 21/04/09 - Siggi - adjustments for new IBM at DKRZ, which is now ibmh
+     # 25/08/09 - BjornM- adapted for lck
 
 
@@ -472 +473 @@
         (lcsgib)         remote_addres=130.73.232.102;;
         (lcsgih)         remote_addres=130.75.4.102;;
+        (lck)            remote_addres=165.132.26.61;;
         (lctit)          remote_addres=172.17.75.161;;
         (lcxt4)          remote_addres=129.177.20.113;;

palm/trunk/SCRIPTS/mrun

@@ -187 +187 @@
      # 19/08/09 - Marcus - MPI debug option
      # 21/08/09 - Marcus - totalview on hice/bice also available for mvapich2
+     # 25/08/09 - BjornM - adpated for lck
 
  
@@ -634 +635 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmb|ibmh|ibms|ibmy|nech|necriam|lcsgib|lcsgih|lctit|unics|lcxt4)  true;;
+        (ibm|ibmb|ibmh|ibms|ibmy|nech|necriam|lcsgib|lcsgih|lctit|unics|lcxt4|lck)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -809 +810 @@
                    do_remote=true
                    case  $host  in
-                       (ibm|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4)  true;;
+                       (ibm|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4|lck)  true;;
                        (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
                             printf "\n      is not available"
@@ -1064 +1065 @@
     do_remote=true
     case  $host  in
-        (ibm|ibmb|ibmh|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4)  true;;
+        (ibm|ibmb|ibmh|ibms|ibmy|lcsgib|lcsgih|lctit|nech|necriam|unics|lcxt4|lck)  true;;
         (*)  printf "\n"
              printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
@@ -1984 +1985 @@
  lopts="$lopts $netcdf_lib $dvr_lib"
  ROPTS="$ropts"
- 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 ]]
+ 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 ]]
  then
     XOPT="-X $numprocs"
@@ -3252 +3253 @@
                       aprun  -n $ii  -N $tasks_per_node  a.out < runfile_atmos  $ROPTS
 
+                   elif [[ $host = lck ]]
+                   then
+                         mpiexec -n $ii  ./a.out  $ROPTS < runfile_atmos &
                    fi
                    wait

palm/trunk/SCRIPTS/subjob

@@ -103 +103 @@
      # 20/07/09 - Siggi - On lcsgi, jobs for returning the job protocol are
      #                    now run on the data nodes (feature=data)
-
+     # 25/08/09 - BjornM- adapted for lck
 
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -179 +179 @@
      (elephanta)             local_addres=130.75.105.6;   local_host=lcmuk;;
      (fimm.bccs.uib.no)      local_addres=172.20.4.2;     local_host=lcfimm;;
+     (node*)                 local_addres=165.132.26.61   local_host=lck;;
      (gallego)               local_addres=130.75.105.10;  local_host=lcmuk;;
      (gfdl5)                 local_addres=165.132.26.58;  local_host=ibmy;;
@@ -330 +331 @@
         (lcsgib)  queue=smallq; remote_addres=130.73.232.103; submcom=/opt/moab/bin/msub;;
         (lcsgih)  queue=smallq; remote_addres=130.75.4.102; submcom=/opt/moab/bin/msub;;
+        (lck)     remote_addres=165.132.26.61; submcom=/usr/torque/bin/qsub;;
         (lctit)   queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
         (lcxt4)   remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;;
@@ -1199 +1201 @@
        then
           eval  $submcom  $job_on_remhost
-       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4 ]]
+       elif [[  $local_host = lcfimm  ||  $local_host = lctit  ||  $localhost = lcxt4 || $localhost = lck ]]
        then
           eval  $submcom  $job_on_remhost

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -1 +1 @@
 New:
 ---
+
+Adapted for machine lck
+(mrun, mbuild, subjob)
+
 bc_lr/bc_ns  in most subroutines replaced by LOGICAL variables bc_lr_cyc,
 bc_ns_cyc for speed optimization
@@ -49 +53 @@
 
 
-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
+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, 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
 
 New: set_particle_attributes, set_slicer_attributes_dvrp

palm/trunk/SOURCE/average_3d_data.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Added calculation of shf* and qsws*
 !
 ! Former revisions:
@@ -129 +129 @@
                 ENDDO
              ENDDO
-             
+
           CASE ( 'ql' )
              DO  i = nxl-1, nxr+1
@@ -175 +175 @@
                 ENDDO
              ENDDO
-          
+
           CASE ( 'rho' )
              DO  i = nxl-1, nxr+1
@@ -184 +184 @@
                 ENDDO
              ENDDO
-             
+
           CASE ( 's' )
              DO  i = nxl-1, nxr+1
@@ -193 +193 @@
                 ENDDO
              ENDDO
-             
+
           CASE ( 'sa' )
              DO  i = nxl-1, nxr+1
@@ -202 +202 @@
                 ENDDO
              ENDDO
-             
+
          CASE ( 'shf*' )
              DO  i = nxl-1, nxr+1
@@ -209 +209 @@
                 ENDDO
              ENDDO
-             
+
           CASE ( 't*' )
              DO  i = nxl-1, nxr+1

palm/trunk/SOURCE/check_parameters.f90

@@ -13 +13 @@
 ! topography_grid_convention moved from user_check_parameters
 ! 'single_street_canyon'
+! Added shf* and qsws* to the list of available output data
 !
 ! Former revisions:

palm/trunk/SOURCE/data_output_2d.f90

@@ -10 +10 @@
 ! Output of user defined 2D (XY) arrays at z=nzb+1 is now possible
 ! Bugfix: to_be_resorted => s_av for time-averaged scalars
-!
+! Calculation of shf* and qsws* added.
 !
 ! Former revisions:

palm/trunk/SOURCE/modules.f90

@@ -20 +20 @@
 ! run_coupled, time_since_reference_point, u_bulk, v_bulk in control_parameters,
 ! default value of grid_matching changed to strict
+! +shf_av, qsws_av
 !
 ! Former revisions:

palm/trunk/SOURCE/read_3d_binary.f90

@@ -5 +5 @@
 ! -----------------
 ! Output of messages replaced by message handling routine.
-!
+! +shf_av, qsws_av
 !
 ! Former revisions:

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +shf*, qsws*
 !
 ! Former revisions:

palm/trunk/SOURCE/write_3d_binary.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! +shf_av, qsws_av
 !
 ! Former revisions: