Changeset 1929 for palm/trunk/SOURCE/wind_turbine_model_mod.f90

Timestamp:

Jun 9, 2016 4:25:25 PM (8 years ago)

Author:

suehring

Message:

several bugfixes in particle model and serial mode

File:

• palm/trunk/SOURCE/wind_turbine_model_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/wind_turbine_model_mod.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: added preprocessor directives for parallel and serial mode
 ! 
 ! Former revisions:
@@ -2058 +2058 @@
 
 !
-!--          Transfer of information to the other cpus            
+!--          Transfer of information to the other cpus
+#if defined( __parallel )         
              CALL MPI_ALLREDUCE( u_inflow_l, u_inflow, nturbines, MPI_REAL,    &
                                  MPI_SUM, comm2d, ierr )
@@ -2065 +2066 @@
              CALL MPI_ALLREDUCE( phi_yaw_l, phi_yaw, nturbines, MPI_REAL,      &
                                  MPI_SUM, comm2d, ierr )
-             
+#else
+             u_inflow = u_inflow_l
+             wdir     = wdir_l
+             phi_yaw  = phi_yaw_l
+#endif
              DO inot = 1, nturbines
 !             
@@ -2080 +2085 @@
 !              CALL MPI_ALLREDUCE( omega_gen, omega_gen_old, nturbines,        &
 !                                  MPI_REAL,MPI_SUM, comm2d, ierr )
+#if defined( __parallel )    
              CALL MPI_ALLREDUCE( torque_gen, torque_gen_old, nturbines,        &
                                  MPI_REAL, MPI_SUM, comm2d, ierr )
@@ -2086 +2092 @@
              CALL MPI_ALLREDUCE( omega_gen_f, omega_gen_f_old, nturbines,      &
                                  MPI_REAL, MPI_SUM, comm2d, ierr )
+#else
+             torque_gen_old  = torque_gen
+             omega_rot       = omega_rot_l
+             omega_gen_f_old = omega_gen_f
+#endif
             
           ENDIF