Changeset 3665 for palm


Ignore:
Timestamp:
Jan 10, 2019 8:28:24 AM (6 years ago)
Author:
raasch
Message:

dummy statements added to avoid compiler warnings about unused variables, unused variables removed, ssh-call for submitting batch jobs on remote systems modified again to avoid output of login messages on specific systems

Location:
palm/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/document_changes

    r2718 r3665  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018 Leibniz Universitaet Hannover
     17# Copyright 1997-2019 Leibniz Universitaet Hannover
    1818#------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palmrun

    r3574 r3665  
    2727# -----------------
    2828# $Id$
     29# ssh-call for submitting batch jobs on remote systems modified again to avoid output
     30# of login messages on specific systems
     31#
     32# 3574 2018-11-28 13:14:39Z raasch
    2933# syntax-error in last commit fixed
    3034#
     
    30313035          if [[ $do_trace = true ]]
    30323036          then
    3033              echo "     echo \"cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}\"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>/dev/null"
     3037             echo "     ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip} \"cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}\" "
    30343038          fi
    3035           echo "cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>/dev/null
     3039          ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip} "cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}"
    30363040
    30373041       elif [[ $create_batch_job = true ]]
  • palm/trunk/SOURCE/advec_s_pw.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! nopointer option removed
    2831!
     
    125128
    126129       USE indices,                                                            &
    127            ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
     130           ONLY:  nxl, nxr, nyn, nys, nzb, nzt
    128131
    129132       USE kinds
     
    192195
    193196       USE indices,                                                            &
    194            ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
     197           ONLY:  nzb, nzt
    195198
    196199       USE kinds
  • palm/trunk/SOURCE/advec_s_up.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! nopointer option removed
    2831!
     
    122125
    123126       USE indices,                                                            &
    124            ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
     127           ONLY:  nxl, nxr, nyn, nys, nzb, nzt
    125128
    126129       USE kinds
     
    198201
    199202       USE indices,                                                            &
    200            ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
     203           ONLY:  nzb, nzt
    201204
    202205       USE kinds
  • palm/trunk/SOURCE/data_output_mask.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! Fix output time levels (use time_since_reference_point)
    2831!
     
    204207       
    205208    USE surface_mod,                                                           &
    206         ONLY :  surf_def_h, surf_lsm_h, surf_usm_h, get_topography_top_index_ji     
     209        ONLY :  get_topography_top_index_ji
    207210
    208211    IMPLICIT NONE
  • palm/trunk/SOURCE/date_and_time_mod.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! further tabs removed, unused variables removed
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! further tabs removed
    2831!
     
    100103    INTEGER(iwp)        ::  hour_call_emis=0                        !< index used to call the emissions just once every hour
    101104
    102     INTEGER(iwp)        ::  ihour           
    103105    INTEGER(iwp)        ::  index_mm                                !< index months of the default emission mode
    104106    INTEGER(iwp)        ::  index_dd                                !< index days of the default emission mode
    105107    INTEGER(iwp)        ::  index_hh                                !< index hours of the emission mode
    106     INTEGER(iwp)        ::  hours_since_reference_point             !< hours of current simulation
    107108
    108109    REAL(wp)            ::  time_utc                     !< current model time in UTC
     
    297298
    298299!--    Variables Definition
    299        INTEGER                          :: i_mon       !< Index for going through the different months
     300       INTEGER :: i_mon       !< Index for going through the different months
    300301
    301302       !> Update simulation time in seconds
     
    494495    !> ------------------------------------------------------------------------
    495496
    496     INTEGER                          :: weekday
     497    INTEGER                          :: weekday
    497498
    498499    !> CONSTANTS
     
    542543
    543544    !> IN/OUTPUT
    544     INTEGER, INTENT(INOUT)              :: mo          !> Month
    545     INTEGER, INTENT(INOUT)              :: hh          !> Hour
    546     INTEGER, INTENT(INOUT)              :: dd          !> Day
    547     INTEGER, INTENT(INOUT)              :: index_hh    !> Index Hour
     545    INTEGER, INTENT(INOUT)              :: mo          !> Month
     546    INTEGER, INTENT(INOUT)              :: hh          !> Hour
     547    INTEGER, INTENT(INOUT)              :: dd          !> Day
     548    INTEGER, INTENT(INOUT)              :: index_hh    !> Index Hour
    548549 
    549550    !> Additional Variables for calculateing indices
    550     INTEGER                             :: index_mm    !> Index Month
    551     INTEGER                             :: index_dd    !> Index Day
    552     INTEGER                             :: i_mon       !> Index for going through the different months
    553     INTEGER                             :: sum_dd      !> Sum days
     551    INTEGER                             :: index_mm    !> Index Month
     552    INTEGER                             :: index_dd    !> Index Day
     553    INTEGER                             :: i_mon       !> Index for going through the different months
     554    INTEGER                             :: sum_dd      !> Sum days
    554555
    555556    !> CONSTANTS
    556     INTEGER, PARAMETER                  :: nmonth=12
    557     INTEGER, PARAMETER                  :: nday = 7
    558     INTEGER, PARAMETER                  :: nhour = 24
     557    INTEGER, PARAMETER                  :: nhour = 24
    559558    INTEGER, PARAMETER, DIMENSION(12)   :: days = (/31,28,31,30,31,30,31,31,30,31,30,31/) ! no leap year
    560559   
  • palm/trunk/SOURCE/gust_mod.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! dummy statements added to avoid compiler warnings about unused variables
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! Bugfix: domain bounds of local_pf corrected
    2831!
     
    5255    IMPLICIT NONE
    5356
    54     LOGICAL  ::  gust_module_enabled = .FALSE.       !< switch, if the entire module is used at all
     57    INTEGER(iwp) ::  idum  !< dummy variable used to avoid compiler warnings about unused variables
     58
     59    LOGICAL ::  dummy_logical = .FALSE.        !< switch to avoid compiler warnings about unused variables
     60    LOGICAL ::  gust_module_enabled = .FALSE.  !< switch, if the entire module is used at all
    5561
    5662    SAVE
     
    228234       INTEGER(iwp) ::  var_count      !<
    229235
     236!
     237!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     238       IF ( dummy_logical )  idum = LEN( unit ) + LEN( variable ) + LEN( dopr_unit ) + var_count
    230239
    231240    END SUBROUTINE gust_check_data_output_pr
     
    244253       CHARACTER (LEN=*) ::  var   !<
    245254
     255!
     256!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     257       IF ( dummy_logical )  idum = LEN( var ) + LEN( unit )
    246258
    247259    END SUBROUTINE gust_check_data_output
     
    277289       CHARACTER (LEN=13), DIMENSION(dots_max) :: dots_label
    278290
     291!
     292!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     293       IF ( dummy_logical )  idum = dots_num + dots_max + LEN( dots_unit(1) ) + LEN( dots_label(1) )
    279294
    280295    END SUBROUTINE gust_init
     
    299314       CHARACTER (LEN=*), INTENT(IN) ::  grid_z      !<
    300315
     316!
     317!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     318       IF ( found )  idum = LEN( var ) + LEN( grid_x ) + LEN( grid_y ) + LEN( grid_z )
    301319
    302320    END SUBROUTINE gust_define_netcdf_grid
     
    315333       INTEGER(iwp), INTENT(IN) ::  io  !< Unit of the output file
    316334
     335!
     336!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     337       IF ( dummy_logical )  idum = io
    317338
    318339    END SUBROUTINE gust_header
     
    331352       CHARACTER (LEN=*) ::  location !<
    332353
     354!
     355!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     356       IF ( dummy_logical )  idum = LEN( location )
    333357
    334358    END SUBROUTINE gust_actions
     
    350374       INTEGER(iwp) ::  j
    351375
     376!
     377!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     378       IF ( dummy_logical )  idum = i + j + LEN( location )
    352379
    353380    END SUBROUTINE gust_actions_ij
     
    364391       IMPLICIT NONE
    365392
    366        INTEGER, INTENT(IN) :: mod_count
    367 
     393       INTEGER, INTENT(IN) ::  mod_count
     394
     395!
     396!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     397       IF ( dummy_logical )  idum = mod_count
    368398
    369399    END SUBROUTINE gust_swap_timelevel
     
    384414       CHARACTER (LEN=*) :: variable !<
    385415
     416!
     417!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     418       IF ( dummy_logical )  idum = LEN( mode ) + LEN( variable )
    386419
    387420    END SUBROUTINE gust_3d_data_averaging
     
    415448          !< array to which output data is resorted to
    416449
     450!
     451!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     452       IF ( found .AND. two_d )  idum = av + LEN( variable ) + LEN( grid ) + local_pf(nxl,nys,nzb_do) + fill_value
    417453
    418454    END SUBROUTINE gust_data_output_2d
     
    441477
    442478       REAL(sp), DIMENSION(nxl:nxr,nys:nyn,nzb_do:nzt_do), INTENT(INOUT) ::  local_pf   !< local
    443           !< array to which output data is resorted to
    444 
     479                                                                                        !< array to which output data is resorted to
     480
     481!
     482!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     483       IF ( found )  idum = av + LEN( variable ) + fill_value + local_pf(nxl,nys,nzb_do)
    445484
    446485    END SUBROUTINE gust_data_output_3d
     
    457496       IMPLICIT NONE
    458497
    459        CHARACTER (LEN=*) ::  mode   !<
    460 
    461        INTEGER(iwp) ::  sr   !<
    462        INTEGER(iwp) ::  tn   !<
     498       CHARACTER (LEN=*) ::  mode  !<
     499
    463500       INTEGER(iwp) ::  dots_max   !<
    464 
     501       INTEGER(iwp) ::  sr         !<
     502       INTEGER(iwp) ::  tn         !<
     503
     504!
     505!--    Next line is just to avoid compiler warnings about unused variables. You may remove it.
     506       IF ( dummy_logical )  idum = dots_max + sr + tn + LEN( mode )
    465507
    466508    END SUBROUTINE gust_statistics
     
    543585       REAL(wp), DIMENSION(nzb:nzt+1,nys_on_file-nbgp:nyn_on_file+nbgp,nxl_on_file-nbgp:nxr_on_file+nbgp) :: tmp_3d   !<
    544586
    545 !
    546 !-- Here the reading of user-defined restart data follows:
    547 !-- Sample for user-defined output
    548 
    549 
     587
     588!
     589!--    Next lins are just to avoid compiler warnings about unused variables in case of empty user interface routine.
     590!--    You may remove them.
     591       IF ( dummy_logical )  THEN
     592          idum = i + k + nxlc + nxlf + nxrc + nxrf + nync + nynf + nysc + nysf +                                       &
     593                 tmp_2d(nys_on_file,nxl_on_file) + tmp_3d(nzb,nys_on_file,nxl_on_file)
     594       ENDIF
     595
     596!
     597!--    Here the reading of user-defined restart data follows:
     598!--    Sample for user-defined output
    550599       found = .TRUE.
    551 
    552600
    553601       SELECT CASE ( restart_string(1:length) )
  • palm/trunk/SOURCE/init_masks.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! Move the control parameter "salsa" from salsa_mod to control_parameters
    2831! (M. Kurppa)
     
    196199   
    197200    USE radiation_model_mod,                                                   &
    198         ONLY:  radiation, radiation_check_data_output
     201        ONLY:  radiation_check_data_output
    199202       
    200203    USE salsa_mod,                                                             &
  • palm/trunk/SOURCE/multi_agent_system_mod.f90

    r3602 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3602 2018-12-04 16:03:51Z sward
    2730! Added check for missing NAVIGATION_DATA input file
    2831!
     
    14421445
    14431446#endif
    1444           agents => NULL()
     1447          NULLIFY( agents )
    14451448#if defined( __parallel )
    14461449          IF ( ALLOCATED( out_agents ) ) DEALLOCATE( out_agents )
     
    27632766
    27642767       USE arrays_3d,                                                          &
    2765            ONLY:  u, v, pt, hyp, exner
     2768           ONLY:  u, v, pt, exner
    27662769
    27672770!       USE chemistry_model_mod,                                                &
  • palm/trunk/SOURCE/netcdf_interface_mod.f90

    r3655 r3665  
    2525! -----------------
    2626! $Id$
     27! Statement added to prevent compiler warning about unused variable
     28!
     29! 3655 2019-01-07 16:51:22Z knoop
    2730! Move the control parameter "salsa" from salsa_mod to control_parameters
    2831! (M. Kurppa)
     
    67776780    INTEGER, INTENT(IN)           :: errno
    67786781    INTEGER, INTENT(OUT)          :: id
     6782    INTEGER                       :: idum  !< dummy variable used to avoid compiler warnings about unused variables
    67796783    LOGICAL, INTENT(IN)           :: parallel
    67806784
     6785!
     6786!-- Next line is just to avoid compiler warning about unused variable
     6787    IF ( parallel )  idum = 0
    67816788
    67826789!
  • palm/trunk/SOURCE/virtual_measurement_mod.f90

    r3522 r3665  
    2525! -----------------
    2626! $Id$
     27! unused variables removed
     28!
     29! 3522 2018-11-13 12:14:36Z suehring
    2730! Sampling of variables
    2831!
     
    184187    INTEGER(iwp) ::  id_vm                           !< NetCDF file id for virtual measurements
    185188    INTEGER(iwp) ::  nvm = 0                         !< number of virtual measurements
    186     INTEGER(iwp) ::  observation_coverage_xy = 0     !< horizontal distance from the measurement point where observations should be taken in the surrounding
    187     INTEGER(iwp) ::  observation_coverage_z  = 0     !< vertical distance from the measurement point where observations should be taken in the surrounding
     189!    INTEGER(iwp) ::  observation_coverage_xy = 0     !< horizontal distance from the measurement point where observations should be taken in the surrounding
     190!    INTEGER(iwp) ::  observation_coverage_z  = 0     !< vertical distance from the measurement point where observations should be taken in the surrounding
    188191   
    189192    LOGICAL ::  use_virtual_measurement = .FALSE. !< Namelist parameter
     
    316319 
    317320    USE netcdf_data_input_mod,                                                 &
    318         ONLY:  init_model, input_file_vm,                                      &
    319                netcdf_data_input_get_dimension_length,                         &
     321        ONLY:  input_file_vm, netcdf_data_input_get_dimension_length,          &
    320322               netcdf_data_input_att, netcdf_data_input_var
    321323               
     
    329331    CHARACTER(LEN=10), DIMENSION(50) ::  measured_variables      = '' !< dummy array with all measured variables that are allowed   
    330332   
    331     INTEGER(iwp) ::  dim_eutm  !< dimension size of UTM easting coordinate
    332     INTEGER(iwp) ::  dim_nutm  !< dimension size of UTM northing coordinate
     333!    INTEGER(iwp) ::  dim_eutm  !< dimension size of UTM easting coordinate
     334!    INTEGER(iwp) ::  dim_nutm  !< dimension size of UTM northing coordinate
    333335    INTEGER(iwp) ::  dim_ntime !< dimension size of time coordinate
    334     INTEGER(iwp) ::  dim_zag   !< dimension size of height coordinate
    335     INTEGER(iwp) ::  i         !< grid index of virtual observation point in x-direction
    336     INTEGER(iwp) ::  ii        !< running index over all coordinate points of a measurement
     336!    INTEGER(iwp) ::  dim_zag   !< dimension size of height coordinate
     337!    INTEGER(iwp) ::  i         !< grid index of virtual observation point in x-direction
     338!    INTEGER(iwp) ::  ii        !< running index over all coordinate points of a measurement
    337339    INTEGER(iwp) ::  is        !< grid index of real observation point of the respective station in x-direction
    338     INTEGER(iwp) ::  j         !< grid index of observation point in x-direction
     340!    INTEGER(iwp) ::  j         !< grid index of observation point in x-direction
    339341    INTEGER(iwp) ::  js        !< grid index of real observation point of the respective station in y-direction
    340     INTEGER(iwp) ::  k         !< grid index of observation point in x-direction
     342!    INTEGER(iwp) ::  k         !< grid index of observation point in x-direction
    341343    INTEGER(iwp) ::  kl        !< lower vertical index of surrounding grid points of an observation coordinate
    342344    INTEGER(iwp) ::  ks        !< grid index of real observation point of the respective station in z-direction
     
    712714     IMPLICIT NONE
    713715     
    714      CHARACTER(LEN=10) ::  trimvar !< dummy for the measured variable name
     716!     CHARACTER(LEN=10) ::  trimvar !< dummy for the measured variable name
    715717     
    716718     INTEGER(iwp) ::  i  !< grid index in x-direction
  • palm/trunk/UTIL/agent_preprocessing/agent_preprocessing.f90

    r3400 r3665  
    1515! PALM. If not, see <http://www.gnu.org/licenses/>.
    1616!
    17 ! Copyright 1997-2018 Leibniz Universitaet Hannover
     17! Copyright 1997-2019 Leibniz Universitaet Hannover
    1818!------------------------------------------------------------------------------!
    1919!
Note: See TracChangeset for help on using the changeset viewer.