Changeset 809


Ignore:
Timestamp:
Jan 30, 2012 1:32:58 PM (10 years ago)
Author:
maronga
Message:

Bugfix: cpp directives .NOT., .AND. replaced by !,&&. Minor bugfixes in mrungui

Location:
palm/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/check_open.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    120120    IF ( openfile(file_id)%opened )  RETURN
    121121
    122 #if .NOT. defined ( __check )
     122#if ! defined ( __check )
    123123!
    124124!-- Only certain files are allowed to be re-opened
     
    240240                CALL local_system( 'mkdir  BINOUT' // coupling_char )
    241241             ENDIF
    242 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     242#if defined( __parallel ) && ! defined ( __check )
    243243!
    244244!--          Set a barrier in order to allow that all other processors in the
     
    279279                        FORM='UNFORMATTED', POSITION='APPEND' )
    280280          ELSE
    281 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     281#if defined( __parallel ) && ! defined ( __check )
    282282!
    283283!--          Set a barrier in order to allow that all other processors in the
     
    660660                CALL local_system( 'mkdir  PARTICLE_INFOS' // coupling_char )
    661661             ENDIF
    662 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     662#if defined( __parallel ) && ! defined ( __check )
    663663!
    664664!--          Set a barrier in order to allow that thereafter all other
     
    709709                CALL local_system( 'mkdir  PARTICLE_DATA' // coupling_char )
    710710             ENDIF
    711 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     711#if defined( __parallel ) && ! defined ( __check )
    712712!
    713713!--          Set a barrier in order to allow that thereafter all other
     
    13121312                                       TRIM( coupling_char ) // '/' )
    13131313                ENDIF
    1314 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     1314#if defined( __parallel ) && ! defined ( __check )
    13151315!
    13161316!--             Set a barrier in order to allow that all other processors in the
  • palm/trunk/SOURCE/check_parameters.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    237237#endif
    238238
    239 #if .NOT. defined( __check )
     239#if ! defined( __check )
    240240       IF ( myid == 0 ) THEN
    241241          CALL MPI_SEND( dt_coupling, 1, MPI_REAL, target_id, 11, comm_inter, &
     
    253253       ENDIF
    254254       IF ( dt_coupling <= 0.0 )  THEN
    255 #if .NOT. defined( __check )
     255#if ! defined( __check )
    256256          IF ( myid == 0  ) THEN
    257257             CALL MPI_SEND( dt_max, 1, MPI_REAL, target_id, 19, comm_inter, ierr )
     
    267267          CALL message( 'check_parameters', 'PA0005', 0, 1, 0, 6, 0 )
    268268       ENDIF
    269 #if .NOT. defined( __check )
     269#if ! defined( __check )
    270270       IF ( myid == 0 ) THEN
    271271          CALL MPI_SEND( restart_time, 1, MPI_REAL, target_id, 12, comm_inter, &
     
    282282          CALL message( 'check_parameters', 'PA0006', 1, 2, 0, 6, 0 )
    283283       ENDIF
    284 #if .NOT. defined( __check )
     284#if ! defined( __check )
    285285       IF ( myid == 0 ) THEN
    286286          CALL MPI_SEND( dt_restart, 1, MPI_REAL, target_id, 13, comm_inter, &
     
    299299
    300300       simulation_time_since_reference = end_time - coupling_start_time
    301 #if .NOT. defined( __check )
     301#if ! defined( __check )
    302302       IF  ( myid == 0 ) THEN
    303303          CALL MPI_SEND( simulation_time_since_reference, 1, MPI_REAL, target_id, &
     
    316316       ENDIF
    317317
    318 #if .NOT. defined( __check )
     318#if ! defined( __check )
    319319       IF ( myid == 0 ) THEN
    320320          CALL MPI_SEND( dx, 1, MPI_REAL, target_id, 15, comm_inter, ierr )
     
    343343       ENDIF
    344344
    345 #if .NOT. defined( __check )
     345#if ! defined( __check )
    346346       IF ( myid == 0) THEN
    347347          CALL MPI_SEND( dy, 1, MPI_REAL, target_id, 16, comm_inter, ierr )
     
    391391    ENDIF
    392392
    393 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     393#if defined( __parallel ) && ! defined ( __check )
    394394!
    395395!-- Exchange via intercommunicator
     
    29592959!
    29602960
    2961 #if .NOT. defined( __check )
     2961#if ! defined( __check )
    29622962!-- Check netcdf precison
    29632963    ldum = .FALSE.
  • palm/trunk/SOURCE/init_grid.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    537537
    538538             ENDIF
    539 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     539#if defined( __parallel ) && ! defined ( __check )
    540540             CALL MPI_BARRIER( comm2d, ierr )
    541541#endif
     
    742742          ENDIF
    743743       ENDDO
    744 #if .NOT. defined ( __check )
     744#if ! defined ( __check )
    745745!
    746746!--    Exchange of lateral boundary values (parallel computers) and cyclic
     
    772772    ENDIF
    773773
    774 #if .NOT. defined ( __check )
     774#if ! defined ( __check )
    775775!
    776776!-- Preliminary: to be removed after completion of the topography code!
  • palm/trunk/SOURCE/init_masks.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    350350!--    Set global masks along all three dimensions (required by
    351351!--    define_netcdf_header).
    352 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     352#if defined( __parallel ) && ! defined ( __check )
    353353!
    354354!--    PE0 receives partial arrays from all processors of the respective mask
     
    443443       ENDIF
    444444
    445 #elif .NOT. defined ( __parallel )
     445#elif ! defined ( __parallel )
    446446!
    447447!--    Local arrays can be relocated directly.
  • palm/trunk/SOURCE/init_pegrid.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    67!
    78! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
     
    218219
    219220
    220 #if .NOT. defined( __check)
     221#if ! defined( __check)
    221222!
    222223!-- Create the virtual processor grid
     
    531532
    532533
    533 #if .NOT. defined( __check)
     534#if ! defined( __check)
    534535!
    535536!-- Collect index bounds from other PEs (to be written to restart file later)
     
    598599#endif
    599600
    600 #if defined( __parallel ) .AND. .NOT. defined( __check)
     601#if defined( __parallel ) && ! defined( __check)
    601602#if defined( __mpi2 )
    602603!
     
    942943
    943944          IF ( i == mg_switch_to_pe0_level )  THEN
    944 #if defined( __parallel ) .AND. .NOT. defined( __check )
     945#if defined( __parallel ) && ! defined( __check )
    945946!
    946947!--          Save the grid size of the subdomain at the switch level, because
     
    975976                              ( nzt_l - nzb + 2 )
    976977
    977 #elif .NOT. defined ( __parallel )
     978#elif ! defined ( __parallel )
    978979             message_string = 'multigrid gather/scatter impossible ' // &
    979980                          'in non parallel mode'
     
    10171018    grid_level = 0
    10181019
    1019 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     1020#if defined( __parallel ) && ! defined ( __check )
    10201021!
    10211022!-- Gridpoint number for the exchange of ghost points (y-line for 2D-arrays)
     
    11001101#endif
    11011102
    1102 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     1103#if defined( __parallel ) && ! defined ( __check )
    11031104!
    11041105!-- Setting of flags for inflow/outflow conditions in case of non-cyclic
     
    11601161                        comm1dx, ierr )
    11611162
    1162 #elif .NOT. defined ( __parallel )
     1163#elif ! defined ( __parallel )
    11631164    IF ( bc_lr == 'dirichlet/radiation' )  THEN
    11641165       inflow_l  = .TRUE.
  • palm/trunk/SOURCE/local_stop.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    4545
    4646
    47 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     47#if defined( __parallel ) && ! defined ( __check )
    4848    IF ( coupling_mode == 'uncoupled' )  THEN
    4949       IF ( abort_mode == 1 )  THEN
  • palm/trunk/SOURCE/modules.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    12621262!------------------------------------------------------------------------------!
    12631263
    1264 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     1264#if defined( __parallel ) && ! defined ( __check )
    12651265#if defined( __lc )
    12661266    USE MPI
     
    12941294    INTEGER ::  ibuf(12), pcoord(2), pdims(2)
    12951295
    1296 #if .NOT. defined ( __check )
     1296#if ! defined ( __check )
    12971297    INTEGER ::  status(MPI_STATUS_SIZE)
    12981298#endif
  • palm/trunk/SOURCE/parin.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    288288
    289289 12       IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
    290 #if .NOT. defined ( __check )
     290#if ! defined ( __check )
    291291             CALL read_var_list
    292292!
     
    361361
    362362       ENDIF
    363 #if defined( __parallel ) .AND. .NOT. ( __check )
     363#if defined( __parallel ) && ! ( __check )
    364364       CALL MPI_BARRIER( MPI_COMM_WORLD, ierr )
    365365#endif
  • palm/trunk/SOURCE/poisfft.f90

    r808 r809  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    77!
    88! Former revisions:
     
    111111    PRIVATE
    112112
    113 #if .NOT. defined ( __check )
     113#if ! defined ( __check )
    114114    PUBLIC  poisfft, poisfft_init
    115115
     
    137137    END SUBROUTINE poisfft_init
    138138
    139 #if .NOT. defined ( __check )
     139#if ! defined ( __check )
    140140    SUBROUTINE poisfft( ar, work )
    141141
  • palm/trunk/SOURCE/poisfft_hybrid.f90

    r808 r809  
    55! Current revisions:
    66! -----------------
    7 !
     7! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives
    88!
    99! Former revisions:
     
    9292
    9393
    94 #if .NOT. defined ( __check )
     94#if ! defined ( __check )
    9595    PUBLIC poisfft_hybrid, poisfft_hybrid_ini
    9696
     
    172172       nwords = ( nxr_p-nxl_p+1 ) * nz * ( nyn_p-nys_p+1 )
    173173
    174 #if defined( __KKMP ) .AND. .NOT. defined ( __check )
     174#if defined( __KKMP ) && ! defined ( __check )
    175175       CALL LOCAL_GETENV( 'OMP_NUM_THREADS', 15, cdummy, idummy )
    176176       READ ( cdummy, '(I8)' )  n_omp_threads
     
    228228       IF ( tasks_per_logical_node >= 2 )  THEN
    229229
    230 #if defined( __parallel ) .AND. .NOT. defined ( __check )
     230#if defined( __parallel ) && ! defined ( __check )
    231231          nodes   = ( numprocs + tasks_per_logical_node - 1 ) / &
    232232                    tasks_per_logical_node
     
    250250!          write(0,*) 'who am i',myid,me,me_node,me_task,nodes,&
    251251!                     tasks_per_logical_node
    252 #elif .NOT. defined( __parallel )
     252#elif ! defined( __parallel )
    253253          message_string = 'parallel environment (MPI) required'
    254254          CALL message( 'poisfft_hybrid_ini', 'PA0282', 1, 2, 0, 6, 0 )
     
    258258    END SUBROUTINE poisfft_hybrid_ini
    259259
    260 #if .NOT. defined ( __check )
     260#if ! defined ( __check )
    261261    SUBROUTINE poisfft_hybrid( ar )
    262262
  • palm/trunk/UTIL/mrungui/mainwindow.cpp

    r794 r809  
    22// Current revisions:
    33// -----------------
     4// Bugfix: waiting for 20 minutes does not suffice for local runs
    45//
    56// Former revisions:
     
    221222//        xtermoutput = xtermoutput+mrun.readAllStandardOutput();
    222223
    223 //  Wait until mrun has finished or wait for 20 minutes
    224     mrun.waitForFinished(1200000);
     224//  Wait until mrun has finished or wait for 2000 minutes
     225    mrun.waitForFinished(12000000000);
    225226
    226227
  • palm/trunk/UTIL/mrungui/mainwindow.ui

    r807 r809  
    793793      <rect>
    794794       <x>130</x>
    795        <y>190</y>
     795       <y>180</y>
    796796       <width>241</width>
    797        <height>16</height>
     797       <height>21</height>
    798798      </rect>
    799799     </property>
Note: See TracChangeset for help on using the changeset viewer.