Changeset 273


Ignore:
Timestamp:
Mar 26, 2009 2:04:05 AM (13 years ago)
Author:
raasch
Message:

further small changes concerning dvr usage on necriam

Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.mrun.config.riam

    r272 r273  
    3434%netcdf_inc        -I:/home/COAR/NC/tatuyama/pub/netcdf-3.6.0-p1/include      necriam parallel
    3535%netcdf_lib        -L/home/COAR/NC/tatuyama/pub/netcdf-3.6.0-p1/lib:-lnetcdf  necriam parallel
     36%dvr_inc           -I:/home/COAR/NC/raasch/dvr/lib           necriam parallel
     37%dvr_lib           -L/home/COAR/NC/raasch/dvr/lib:-lDVRP2:-lftp  necriam parallel
    3638%fopts             -C:hopt:-Wf:\'-init:stack=nan:-init:heap=nan:-A:idbl4:-pvctl:fullmsg\':-ftrace:-P:stack:-pi:auto:-pi:line=1000  necriam parallel
    3739%lopts             -C:hopt:-Wf:\'-init:stack=nan:-init:heap=nan:-A:idbl4\':-ftrace:-P:stack:-pi:auto:-pi:line=1000:-L/SX/opt/mathkeisan/MK3_0/lib0/:-l:fft  necriam parallel
  • palm/trunk/SOURCE/init_dvrp.f90

    r272 r273  
    1010! Polygon reduction for building and ground plate isosurface. Reduction level
    1111! for buildings can be chosen with parameter cluster_size.
    12 ! Steering, splitting, and rtsp routines not used on necriam.
     12! Steering, splitting, and rtsp routines not used on nec.
    1313! ToDo: checking of mode_dvrp for legal values is not correct
    1414! Implementation of a MPI-1 coupling: __mpi2 adjustments for MPI_COMM_WORLD
     
    220220             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/camera.dvr'
    221221             dvrp_file_c = dvrp_file
    222 #ifndef __necriam
     222#ifndef __nec
    223223             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
    224224                                    dvrp_password_c, dvrp_directory_c, &
     
    280280                              // '/topography.dvr'
    281281                dvrp_file_c = dvrp_file
    282 #ifndef __necriam
     282#ifndef __nec
    283283                CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
    284284                                       dvrp_password_c, dvrp_directory_c, &
     
    405405                           '/groundplate.dvr'
    406406             dvrp_file_c = dvrp_file
    407 #ifndef __necriam
     407#ifndef __nec
    408408             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
    409409                                    dvrp_password_c, dvrp_directory_c, &
     
    537537                name_c  = TRIM( do3d(0,vn) )
    538538                tmp_thr = threshold(tv)
    539 #ifndef __necriam
     539#ifndef __nec
    540540                CALL DVRP_STEERING_INIT( m-1, name_c, steering_dvrp(pn)%min, &
    541541                                         steering_dvrp(pn)%max, tmp_thr )
     
    555555                      steering_dvrp(pn)%imax   = nz_do3d
    556556                      slicer_position_dvrp(pn) = section(1,1)
    557 #ifndef __necriam
     557#ifndef __nec
    558558                      CALL DVRP_STEERING_INIT( m-1, name_c,            &
    559559                                               steering_dvrp(pn)%imin, &
     
    565565                      steering_dvrp(pn)%imax   = ny
    566566                      slicer_position_dvrp(pn) = section(1,2)
    567 #ifndef __necriam
     567#ifndef __nec
    568568                      CALL DVRP_STEERING_INIT( m-1, name_c,            &
    569569                                               steering_dvrp(pn)%imin, &
     
    575575                      steering_dvrp(pn)%imax = nx
    576576                      slicer_position_dvrp(pn) = section(1,3)
    577 #ifndef __necriam
     577#ifndef __nec
    578578                      CALL DVRP_STEERING_INIT( m-1, name_c,            &
    579579                                               steering_dvrp(pn)%imin, &
     
    591591          dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'
    592592          dvrp_file_c = dvrp_file
    593 #ifndef __necriam
     593#ifndef __nec
    594594          CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
    595595                                 dvrp_password_c, dvrp_directory_c, &
     
    734734!--    Adjustment for new MPI-1 coupling. This might be unnecessary.
    735735#if defined( __mpi2 )
    736 #ifndef __necriam
     736#ifndef __nec
    737737       CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
    738738#endif
     
    743743          CALL message( 'init_dvrp_logging', 'PA0199', 1, 2, 0, 6, 0 )
    744744 
    745 #ifndef __necriam
     745#ifndef __nec
    746746          CALL DVRP_SPLIT( comm_inter, comm_palm )
    747747#endif
    748748       ELSE
    749 #ifndef __necriam
     749#ifndef __nec
    750750          CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
    751751#endif
     
    787787       CALL DVRP_LOG_EVENT( -1, 1 )   ! Logging of total cpu-time used by PALM
    788788       IF ( use_seperate_pe_for_dvrp_output )  THEN
    789 #ifndef __necriam
     789#ifndef __nec
    790790          CALL DVRP_SPLIT_EXIT( 1 )      ! Argument 0: reduced output
    791791#endif
Note: See TracChangeset for help on using the changeset viewer.