- Timestamp:
- May 27, 2016 2:28:12 PM (8 years ago)
- Location:
- palm/trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mrun
r1914 r1917 918 918 919 919 920 920 921 # PROVIDE VALUES OF ENVIRONMENT-VARIABLE FOR interpret_config VIA NAMELIST-FILE 921 922 cat > .mrun_environment << %%END%% … … 926 927 localhost = '$localhost', output_list = '$output_list' / 927 928 928 929 929 %%END%% 930 930 … … 958 958 rm .mrun_environment 959 959 960 960 961 # EXECUTE SHELL-COMMANDS GENERATED BY interpret_config WITHIN THIS SHELL 961 962 chmod u+x $interpreted_config_file … … 965 966 966 967 fi 968 967 969 968 970 # VALUES OF MRUN-OPTIONS OVERWRITE THOSE FROM THE CONFIGURATION-FILE -
palm/trunk/SCRIPTS/subjob
r1914 r1917 907 907 if [[ $numprocs != 0 ]] 908 908 then 909 pe_set="#$ -pe openmpi $numprocs"910 else 911 pe_set="#$ -pe openmpi 1"909 pe_set="#$ -pe impi $numprocs" 910 else 911 pe_set="#$ -pe impi 1" 912 912 fi 913 913 if [[ $queue = default ]] -
palm/trunk/SOURCE/Makefile
r1914 r1917 25 25 # ----------------- 26 26 # $Id$ 27 # 28 # 1914 2016-05-26 14:44:07Z witha 29 # Added wind_turbine_model_mod 27 30 # 28 31 # 1900 2016-05-04 15:27:53Z raasch … … 56 59 # Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat 57 60 # removed. 58 #59 # 1819 2016-04-06 21:05:15Z witha60 # Added wind turbine model and renamed it from wind_turbine_model to61 # wind_turbine_model_mod62 61 # 63 62 # 1817 2016-04-06 15:44:20Z maronga -
palm/trunk/SOURCE/check_parameters.f90
r1914 r1917 24 24 ! ----------------- 25 25 ! $Id$ 26 ! 27 ! 1914 2016-05-26 14:44:07Z witha 28 ! Added checks for the wind turbine model 26 29 ! 27 30 ! 1841 2016-04-07 19:14:06Z raasch -
palm/trunk/SOURCE/init_3d_model.f90
r1914 r1917 24 24 ! ----------------- 25 25 ! $Id$ 26 ! 27 ! 1914 2016-05-26 14:44:07Z witha 28 ! Added initialization of the wind turbine model 26 29 ! 27 30 ! 1878 2016-04-19 12:30:36Z hellstea … … 36 39 ! 1845 2016-04-08 08:29:13Z raasch 37 40 ! nzb_2d replaced by nzb_u|v_inner 38 !39 ! 1839 2016-04-07 18:48:14Z witha40 ! Renamed calls for wind turbine model41 41 ! 42 42 ! 1833 2016-04-07 14:23:03Z raasch … … 52 52 ! 1822 2016-04-07 07:49:42Z hoffmann 53 53 ! icloud_scheme replaced by microphysics_* 54 !55 ! 1819 2016-04-06 21:05:15Z witha56 ! Added initialization of the wind turbine model57 54 ! 58 55 ! 1817 2016-04-06 15:44:20Z maronga -
palm/trunk/SOURCE/package_parin.f90
r1914 r1917 27 27 ! 1871 2016-04-15 11:46:09Z hoffmann 28 28 ! Initialization of aerosols added. 29 !30 ! 1839 2016-04-07 18:48:14Z witha31 ! Reading of &wind_turbine_par moved to wind_turbine_model_mod32 29 ! 33 30 ! 1833 2016-04-07 14:23:03Z raasch … … 44 41 ! +collision_algorithm 45 42 ! Tails removed. 46 47 ! 1819 2016-04-06 21:05:15Z witha48 ! Added namelist for wind turbine model49 43 ! 50 44 ! 1817 2016-04-06 15:44:20Z maronga -
palm/trunk/SOURCE/parin.f90
r1914 r1917 25 25 ! $Id$ 26 26 ! 27 ! 1914 2016-05-26 14:44:07Z witha 28 ! Added call to wind turbine model for reading of &wind_turbine_par 29 ! 27 30 ! 1849 2016-04-08 11:33:18Z hoffmann 28 31 ! Adapted for modularization of microphysics 29 !30 ! 1839 2016-04-07 18:48:14Z witha31 ! Added call to wind turbine model for reading of &wind_turbine_par32 32 ! 33 33 ! 1833 2016-04-07 14:23:03Z raasch -
palm/trunk/SOURCE/prognostic_equations.f90
r1914 r1917 24 24 ! ----------------- 25 25 ! $Id$ 26 ! 27 ! 1914 2016-05-26 14:44:07Z witha 28 ! Added calls for wind turbine model 26 29 ! 27 30 ! 1873 2016-04-18 14:50:06Z maronga … … 36 39 ! 1822 2016-04-07 07:49:42Z hoffmann 37 40 ! Kessler microphysics scheme moved to microphysics. 38 39 ! 1819 2016-04-06 21:05:15Z witha40 ! Added calls for wind turbine model41 41 ! 42 42 ! 1757 2016-02-22 15:49:32Z maronga 43 !44 43 ! 45 44 ! 1691 2015-10-26 16:17:44Z maronga -
palm/trunk/SOURCE/time_integration.f90
r1914 r1917 25 25 ! $Id$ 26 26 ! 27 ! 1914 2016-05-26 14:44:07Z witha 28 ! Added call for wind turbine model 29 ! 27 30 ! 1878 2016-04-19 12:30:36Z hellstea 28 31 ! Synchronization for nested runs rewritten … … 42 45 ! 1822 2016-04-07 07:49:42Z hoffmann 43 46 ! icloud_scheme replaced by microphysics_* 44 !45 ! 1819 2016-04-06 21:05:15Z witha46 ! Added call for wind turbine model and moved it47 47 ! 48 48 ! 1808 2016-04-05 19:44:00Z raasch -
palm/trunk/SOURCE/wind_turbine_model_mod.f90
r1914 r1917 24 24 ! ----------------- 25 25 ! $Id$ 26 !27 ! 1912 2016-05-26 13:03:07Z witha28 ! Added subroutine wtm_check_parameters29 ! Renamed wtm_read_tables to wtm_read_blade_tables30 ! Review of Pitch and Speed Control31 !32 ! 1864 2016-04-14 17:23:11Z witha33 ! Definition of PRIVATE and PUBLIC variables and functions34 ! Relocation of some variables from module to the subroutines35 ! Added subroutines wtm_speed_control and wtm_init_speed_control36 ! Airfoil tables are now read from the input folder37 !38 ! 1843 2016-04-08 08:20:19Z witha39 ! Bugfix and revision in reading mechanism40 26 ! 41 ! 1839 2016-04-07 18:48:14Z witha 42 ! Added subroutine for parin, renamed subroutines, witha 43 ! Added subroutine wtm_read_tables, changes on parin, lvo 44 ! 45 ! 1820 2016-04-06 21:08:26Z witha 27 ! 1914 2016-05-26 14:44:07Z witha 46 28 ! Initial revision 47 29 ! … … 63 45 !> @todo Implement ADM and ALM turbine models 64 46 !> @todo Generate header information 65 !> @todo Implement parameter checks and error messages47 !> @todo Implement further parameter checks and error messages 66 48 !> @todo Revise and add code documentation 67 49 !> @todo Output turbine parameters as timeseries
Note: See TracChangeset
for help on using the changeset viewer.