Changeset 2113 for palm/trunk

Timestamp:

Jan 12, 2017 1:40:46 PM (8 years ago)

Author:

kanani

Message:

cpp switch mpi3 added for MPI-3 standard code

File:

• palm/trunk/SOURCE/urban_surface_mod.f90 (modified) (13 diffs)

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -15 +15 @@
 ! PALM. If not, see <http://www.gnu.org/licenses/>.
 !
-! Copyright 2015-2016 Czech Technical University in Prague
+! Copyright 2015-2017 Czech Technical University in Prague
 ! Copyright 1997-2017 Leibniz Universitaet Hannover
 !--------------------------------------------------------------------------------!
@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! 
+! cpp switch __mpi3 added for MPI-3 standard code (Ketelsen)
 ! 
 ! Former revisions:
@@ -1486 +1486 @@
         CALL location_message( '    calculation of SVF and CSF', .TRUE. )
 
+#if defined( __mpi3 )
 !--     precalculate face areas for different face directions using normal vector
         DO d = 0, 9
@@ -1960 +1961 @@
         CALL message( 'init_urban_surface', 'PA0502', 2, 2, 0, 6, 0 )
        
+#endif
     END SUBROUTINE usm_calc_svf
 
@@ -2635 +2637 @@
         REAL(wp)     ::  c, d, tin, exn
         
+
         CALL cpu_log( log_point_s(78), 'usm_init', 'start' )
 !--     surface forcing have to be disabled for LSF 
@@ -2738 +2741 @@
         
         CALL cpu_log( log_point_s(78), 'usm_init', 'stop' )
-        
+
         
     END SUBROUTINE usm_init_urban_surface
@@ -2857 +2860 @@
 !--    Set flag that indicates that the land surface model is switched on
        urban_surface = .TRUE.
+       
+!
+!--    Check whether pre-processor (cpp) option "__mpi3" is set. It is required
+!--    for the full functionality of the USM. "__mpi3" directive is implemented,
+!--    because some compilers cannot handle MPI-3 operations, hence, these parts
+!--    of code shall only be compiled if explicitly enabled.
+#if ! defined ( __mpi3 )
+          message_string = 'urban surface model requires compilation of ' //   & 
+                           'PALM with pre-processor directive -D__mpi3'
+          CALL message( 'usm_parin', 'PA0503', 1, 2, 0, 6, 0 )
+#endif
 
 
@@ -3203 +3217 @@
         REAL(wp), PARAMETER                    :: grow_factor = 1.5_wp !< factor of expansion of grow arrays
 
+#if defined( __mpi3 )
 !--     Maximum number of gridboxes visited equals to maximum number of boundaries crossed in each dimension plus one. That's also
 !--     the maximum number of plant canopy boxes written. We grow the acsf array accordingly using exponential factor.
@@ -3346 +3361 @@
         visible = .TRUE.
         
+#else
+        visible      = .FALSE.                          !Set variables to avoid compiler warnimngs
+        transparency = 0.0
+#endif
     END SUBROUTINE usm_raytrace
     
@@ -3499 +3518 @@
           ENDIF
 #if defined( __parallel )
-          CALL MPI_Barrier( comm2d, ierr )
+          CALL MPI_BARRIER( comm2d, ierr )
 #endif
        ENDDO
@@ -3914 +3933 @@
         REAL(wp)                              :: acoef              !< actual coefficient of diurnal profile of anthropogenic heat
 
+#if defined( __mpi3 )
         dxdir = (/dz,dy,dy,dx,dx/)
         
@@ -4124 +4144 @@
        ENDIF
 
+#endif
     END SUBROUTINE usm_surface_energy_balance
 
@@ -4249 +4270 @@
           ENDIF
 #if defined( __parallel )
-          CALL MPI_Barrier( comm2d, ierr )
+          CALL MPI_BARRIER( comm2d, ierr )
 #endif
        ENDDO