Changeset 273 for palm

Timestamp:

Mar 26, 2009 2:04:05 AM (16 years ago)

Author:

raasch

Message:

further small changes concerning dvr usage on necriam

Location:

palm/trunk

Files:

• SCRIPTS/.mrun.config.riam (modified) (1 diff)
• SOURCE/init_dvrp.f90 (modified) (12 diffs)

palm/trunk/SCRIPTS/.mrun.config.riam

@@ -34 +34 @@
 %netcdf_inc        -I:/home/COAR/NC/tatuyama/pub/netcdf-3.6.0-p1/include      necriam parallel
 %netcdf_lib        -L/home/COAR/NC/tatuyama/pub/netcdf-3.6.0-p1/lib:-lnetcdf  necriam parallel
+%dvr_inc           -I:/home/COAR/NC/raasch/dvr/lib           necriam parallel
+%dvr_lib           -L/home/COAR/NC/raasch/dvr/lib:-lDVRP2:-lftp  necriam parallel
 %fopts             -C:hopt:-Wf:\'-init:stack=nan:-init:heap=nan:-A:idbl4:-pvctl:fullmsg\':-ftrace:-P:stack:-pi:auto:-pi:line=1000  necriam parallel
 %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

@@ -10 +10 @@
 ! Polygon reduction for building and ground plate isosurface. Reduction level
 ! for buildings can be chosen with parameter cluster_size.
-! Steering, splitting, and rtsp routines not used on necriam.
+! Steering, splitting, and rtsp routines not used on nec.
 ! ToDo: checking of mode_dvrp for legal values is not correct
 ! Implementation of a MPI-1 coupling: __mpi2 adjustments for MPI_COMM_WORLD
@@ -220 +220 @@
              dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/camera.dvr'
              dvrp_file_c = dvrp_file
-#ifndef __necriam
+#ifndef __nec
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
                                     dvrp_password_c, dvrp_directory_c, &
@@ -280 +280 @@
                               // '/topography.dvr'
                 dvrp_file_c = dvrp_file
-#ifndef __necriam
+#ifndef __nec
                 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
                                        dvrp_password_c, dvrp_directory_c, &
@@ -405 +405 @@
                            '/groundplate.dvr'
              dvrp_file_c = dvrp_file
-#ifndef __necriam
+#ifndef __nec
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
                                     dvrp_password_c, dvrp_directory_c, &
@@ -537 +537 @@
                 name_c  = TRIM( do3d(0,vn) )
                 tmp_thr = threshold(tv)
-#ifndef __necriam
+#ifndef __nec
                 CALL DVRP_STEERING_INIT( m-1, name_c, steering_dvrp(pn)%min, &
                                          steering_dvrp(pn)%max, tmp_thr )
@@ -555 +555 @@
                       steering_dvrp(pn)%imax   = nz_do3d
                       slicer_position_dvrp(pn) = section(1,1)
-#ifndef __necriam
+#ifndef __nec
                       CALL DVRP_STEERING_INIT( m-1, name_c,            &
                                                steering_dvrp(pn)%imin, &
@@ -565 +565 @@
                       steering_dvrp(pn)%imax   = ny
                       slicer_position_dvrp(pn) = section(1,2)
-#ifndef __necriam
+#ifndef __nec
                       CALL DVRP_STEERING_INIT( m-1, name_c,            &
                                                steering_dvrp(pn)%imin, &
@@ -575 +575 @@
                       steering_dvrp(pn)%imax = nx
                       slicer_position_dvrp(pn) = section(1,3)
-#ifndef __necriam
+#ifndef __nec
                       CALL DVRP_STEERING_INIT( m-1, name_c,            &
                                                steering_dvrp(pn)%imin, &
@@ -591 +591 @@
           dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'
           dvrp_file_c = dvrp_file
-#ifndef __necriam
+#ifndef __nec
           CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
                                  dvrp_password_c, dvrp_directory_c, &
@@ -734 +734 @@
 !--    Adjustment for new MPI-1 coupling. This might be unnecessary.
 #if defined( __mpi2 )
-#ifndef __necriam
+#ifndef __nec
        CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
 #endif
@@ -743 +743 @@
           CALL message( 'init_dvrp_logging', 'PA0199', 1, 2, 0, 6, 0 )
  
-#ifndef __necriam
+#ifndef __nec
           CALL DVRP_SPLIT( comm_inter, comm_palm )
 #endif
        ELSE
-#ifndef __necriam
+#ifndef __nec
           CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
 #endif
@@ -787 +787 @@
        CALL DVRP_LOG_EVENT( -1, 1 )   ! Logging of total cpu-time used by PALM
        IF ( use_seperate_pe_for_dvrp_output )  THEN
-#ifndef __necriam
+#ifndef __nec
           CALL DVRP_SPLIT_EXIT( 1 )      ! Argument 0: reduced output
 #endif