Changeset 1914 for palm/trunk/SOURCE

Timestamp:

May 26, 2016 2:44:07 PM (9 years ago)

Author:

witha

Message:

Merged branch/forwind into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/Makefile (modified) (8 diffs, 1 prop)
• SOURCE/check_parameters.f90 (modified) (2 diffs, 1 prop)
• SOURCE/init_3d_model.f90 (modified) (5 diffs, 1 prop)
• SOURCE/package_parin.f90 (modified) (2 diffs)
• SOURCE/parin.f90 (modified) (3 diffs)
• SOURCE/prognostic_equations.f90 (modified) (12 diffs)
• SOURCE/time_integration.f90 (modified) (3 diffs)
• SOURCE/wind_turbine_model_mod.f90 (copied) (copied from palm/branches/forwind/SOURCE/wind_turbine_model_mod.f90)

palm/trunk/SOURCE/Makefile

@@ -56 +56 @@
 # Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat
 # removed. 
+#
+# 1819 2016-04-06 21:05:15Z witha
+# Added wind turbine model and renamed it from wind_turbine_model to
+# wind_turbine_model_mod
 #
 # 1817 2016-04-06 15:44:20Z maronga
@@ -330 +334 @@
         user_parin.f90 user_read_restart_data.f90 \
         user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \
-        write_3d_binary.f90 write_var_list.f90
+        wind_turbine_model_mod.f90 write_3d_binary.f90 write_var_list.f90
 
 
@@ -383 +387 @@
 check_parameters.o: modules.o mod_kinds.o land_surface_model_mod.o \
         netcdf_interface_mod.o plant_canopy_model_mod.o pmc_interface_mod.o radiation_model_mod.o \
-        spectra_mod.o subsidence_mod.o microphysics_mod.o
+        spectra_mod.o subsidence_mod.o microphysics_mod.o wind_turbine_model_mod.o
 close_file.o: modules.o mod_kinds.o netcdf_interface_mod.o
 compute_vpt.o: modules.o mod_kinds.o
@@ -429 +433 @@
    lpm_init.o ls_forcing_mod.o netcdf_interface_mod.o plant_canopy_model_mod.o \
    radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \
-   surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o
+   surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o \
+   wind_turbine_model_mod.o
 init_advec.o: modules.o mod_kinds.o
 init_cloud_physics.o: modules.o mod_kinds.o
@@ -486 +491 @@
 parin.o: modules.o cpulog_mod.o land_surface_model_mod.o mod_kinds.o netcdf_interface_mod.o \
    plant_canopy_model_mod.o pmc_interface_mod.o progress_bar_mod.o spectra_mod.o \
-   radiation_model_mod.o microphysics_mod.o
+   radiation_model_mod.o microphysics_mod.o wind_turbine_model_mod.o
 plant_canopy_model_mod.o: modules.o mod_kinds.o
 pmc_interface_mod.o: modules.o mod_kinds.o pmc_client_mod.o pmc_general_mod.o\
@@ -508 +513 @@
         eqn_state_seawater.o mod_kinds.o microphysics_mod.o \
         nudging_mod.o plant_canopy_model_mod.o production_e.o radiation_model_mod.o \
-        subsidence_mod.o user_actions.o
+        subsidence_mod.o user_actions.o wind_turbine_model_mod.o
 progress_bar_mod.o: modules.o mod_kinds.o
 radiation_model_mod.o : modules.o mod_particle_attributes.o microphysics_mod.o
@@ -536 +541 @@
         ls_forcing_mod.o mod_kinds.o nudging_mod.o pmc_interface_mod.o production_e.o \
         prognostic_equations.o progress_bar_mod.o radiation_model_mod.o \
-        spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o
+        spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o \
+        wind_turbine_model_mod.o
 time_to_string.o: mod_kinds.o
 timestep.o: modules.o cpulog_mod.o mod_kinds.o microphysics_mod.o
@@ -572 +578 @@
 user_statistics.o: modules.o mod_kinds.o netcdf_interface_mod.o user_module.o
 wall_fluxes.o: modules.o mod_kinds.o
+wind_turbine_model_mod.o: modules.o cpulog_mod.o mod_kinds.o
 write_3d_binary.o: modules.o cpulog_mod.o mod_kinds.o land_surface_model_mod.o \
         radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \

palm/trunk/SOURCE/check_parameters.f90

@@ -389 +389 @@
     USE statistics
     USE transpose_indices
+    USE wind_turbine_model_mod,                                                &
+        ONLY: wtm_check_parameters, wind_turbine
 
 
@@ -1057 +1059 @@
 
 !
+!-- If wind turbine model is used, perform additional checks
+    IF ( wind_turbine )  CALL wtm_check_parameters
+!
 !-- When radiation model is used, peform addtional checks
     IF ( radiation )  CALL radiation_check_parameters
+
 
     IF ( .NOT. ( loop_optimization == 'cache'  .OR.                            &

palm/trunk/SOURCE/init_3d_model.f90

@@ -37 +37 @@
 ! nzb_2d replaced by nzb_u|v_inner
 ! 
+! 1839 2016-04-07 18:48:14Z witha
+! Renamed calls for wind turbine model
+!
 ! 1833 2016-04-07 14:23:03Z raasch
 ! initialization of spectra quantities moved to spectra_mod
@@ -50 +53 @@
 ! icloud_scheme replaced by microphysics_*
 !
+! 1819 2016-04-06 21:05:15Z witha
+! Added initialization of the wind turbine model
+! 
 ! 1817 2016-04-06 15:44:20Z maronga
 ! Renamed lsm calls.
@@ -331 +337 @@
    
     USE transpose_indices 
+
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wtm_init, wtm_init_arrays, wind_turbine
 
     IMPLICIT NONE
@@ -688 +697 @@
 
 !
+!-- Allocate wind turbine model arrays
+    IF ( wind_turbine )  THEN
+       CALL wtm_init_arrays
+    ENDIF
+
+!
 !-- Allocate arrays containing the RK coefficient for calculation of 
 !-- perturbation pressure and turbulent fluxes. At this point values are
@@ -1675 +1690 @@
        CALL location_message( 'finished', .TRUE. )
     ENDIF
+    
+!
+!-- If required, initialize quantities needed for the wind turbine model
+    IF ( wind_turbine )  THEN
+       CALL location_message( 'initializing wind turbine model', .FALSE. )
+       CALL wtm_init
+       CALL location_message( 'finished', .TRUE. )
+    ENDIF
+
 
 !

palm/trunk/SOURCE/package_parin.f90

@@ -28 +28 @@
 ! Initialization of aerosols added.
 !
+! 1839 2016-04-07 18:48:14Z witha
+! Reading of &wind_turbine_par moved to wind_turbine_model_mod
+! 
 ! 1833 2016-04-07 14:23:03Z raasch
 ! reading of spectra_par moved to spectra_mod
@@ -41 +44 @@
 ! +collision_algorithm
 ! Tails removed.
+
+! 1819 2016-04-06 21:05:15Z witha
+! Added namelist for wind turbine model
 !
 ! 1817 2016-04-06 15:44:20Z maronga

palm/trunk/SOURCE/parin.f90

@@ -27 +27 @@
 ! 1849 2016-04-08 11:33:18Z hoffmann
 ! Adapted for modularization of microphysics
+!
+! 1839 2016-04-07 18:48:14Z witha
+! Added call to wind turbine model for reading of &wind_turbine_par
 !
 ! 1833 2016-04-07 14:23:03Z raasch
@@ -259 +262 @@
     USE statistics,                                                            &
         ONLY:  hom, hom_sum, pr_palm, region, statistic_regions
+
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wtm_parin
 
 
@@ -504 +510 @@
 
 !
+!--       Check if wind turbine model is used and read &wind_turbine_par if
+!--       required
+          CALL wtm_parin
+
+!
 !--       Read user-defined variables
           CALL user_parin

palm/trunk/SOURCE/prognostic_equations.f90

@@ -28 +28 @@
 ! Module renamed (removed _mod)
 ! 
-! 
 ! 1850 2016-04-08 13:29:27Z maronga
 ! Module renamed
-! 
 ! 
 ! 1826 2016-04-07 12:01:39Z maronga
@@ -38 +36 @@
 ! 1822 2016-04-07 07:49:42Z hoffmann
 ! Kessler microphysics scheme moved to microphysics.
+
+! 1819 2016-04-06 21:05:15Z witha
+! Added calls for wind turbine model
 !
 ! 1757 2016-02-22 15:49:32Z maronga
@@ -313 +314 @@
         ONLY:  user_actions
 
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wind_turbine, wtm_tendencies
+
 
     PRIVATE
@@ -428 +432 @@
              IF ( nudging )  CALL nudge( i, j, simulated_time, 'u' )
 
+!
+!--          Forces by wind turbines
+             IF ( wind_turbine )  CALL wtm_tendencies( i, j, 1 )
+
              CALL user_actions( i, j, 'u-tendency' )
 !
@@ -487 +495 @@
              IF ( nudging )  CALL nudge( i, j, simulated_time, 'v' )
 
+!
+!--          Forces by wind turbines
+             IF ( wind_turbine )  CALL wtm_tendencies( i, j, 2 )
+
              CALL user_actions( i, j, 'v-tendency' )
 !
@@ -543 +555 @@
 !--       Drag by plant canopy
           IF ( plant_canopy )  CALL pcm_tendency( i, j, 3 )
+
+!
+!--       Forces by wind turbines
+          IF ( wind_turbine )  CALL wtm_tendencies( i, j, 3 )
 
           CALL user_actions( i, j, 'w-tendency' )
@@ -1011 +1027 @@
     IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 1 )
+
     CALL user_actions( 'u-tendency' )
 
@@ -1087 +1107 @@
     IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 2 )
+
     CALL user_actions( 'v-tendency' )
 
@@ -1158 +1182 @@
 !-- Drag by plant canopy
     IF ( plant_canopy )  CALL pcm_tendency( 3 )
+
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 3 )
 
     CALL user_actions( 'w-tendency' )
@@ -1847 +1875 @@
     IF ( nudging )  CALL nudge( simulated_time, 'u' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 1 )
+
     CALL user_actions( 'u-tendency' )
 
@@ -1914 +1946 @@
     IF ( nudging )  CALL nudge( simulated_time, 'v' )
 
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 2 )
+
     CALL user_actions( 'v-tendency' )
 
@@ -1976 +2012 @@
 !-- Drag by plant canopy
     IF ( plant_canopy )  CALL pcm_tendency( 3 )
+
+!
+!-- Forces by wind turbines
+    IF ( wind_turbine )  CALL wtm_tendencies( 3 )
 
     CALL user_actions( 'w-tendency' )

palm/trunk/SOURCE/time_integration.f90

@@ -42 +42 @@
 ! 1822 2016-04-07 07:49:42Z hoffmann
 ! icloud_scheme replaced by microphysics_*
+!
+! 1819 2016-04-06 21:05:15Z witha
+! Added call for wind turbine model and moved it
 !
 ! 1808 2016-04-05 19:44:00Z raasch
@@ -316 +319 @@
         ONLY:  user_actions
 
+    USE wind_turbine_model_mod,                                                &
+        ONLY:  wind_turbine, wtm_forces
+
     IMPLICIT NONE
 
@@ -405 +411 @@
        CALL user_actions( 'before_timestep' )
 
+!
+!--    Calculate forces by wind turbines
+       IF ( wind_turbine )  THEN
+
+          CALL cpu_log( log_point(55), 'wind_turbine', 'start' )
+
+          CALL wtm_forces
+
+          CALL cpu_log( log_point(55), 'wind_turbine', 'stop' )
+
+       ENDIF       
+       
 !
 !--    Start of intermediate step loop