Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wind models refactoring and Simplified Actuator Disk model #1667

Merged
merged 35 commits into from
Jul 23, 2024
Merged

Wind models refactoring and Simplified Actuator Disk model #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6e8d690
First working draft of simplified actuator disk
Jul 4, 2024
f5e0dc7
Merging development
Jul 4, 2024
3a11281
Correcting checkpoint write
Jul 5, 2024
0283354
Refactoring windfarm routines
Jul 7, 2024
682be3c
WIP:Refactoring for wind farm models
Jul 7, 2024
5d215f4
Updating README
Jul 7, 2024
5999a0b
More refactor
Jul 9, 2024
e759f36
Some more refactoring
Jul 14, 2024
b391ffc
Some more refactoring
Jul 14, 2024
7056cfe
Refactoring almost done
Jul 16, 2024
2ce4ec2
Refactoring almost complete
Jul 16, 2024
6c29cd5
Removing unused dirs and files
Jul 16, 2024
c76f104
Adding ifdef to correct compilation error
Jul 16, 2024
21c63ce
Removing compile time option from Make.ERF
Jul 16, 2024
6ede030
Correcting compilation errors
Jul 16, 2024
f5bc945
Correcting CMake compilation
Jul 16, 2024
923df4e
Correcting CMake compilation
Jul 16, 2024
1fb04aa
Removing unused variables
Jul 16, 2024
8944063
Merge remote-tracking branch 'upstream/development' into ActuatorDisk
Jul 16, 2024
679a120
Correcting clang compilation errors
Jul 16, 2024
81842a5
Correcting CMake compilation errors
Jul 16, 2024
1244030
Correcting CMake errors
Jul 16, 2024
09ebadf
Removing unused variables
Jul 16, 2024
1e90696
Removing unused variables
Jul 16, 2024
4839d17
Removing unused variables
Jul 17, 2024
1db84b2
Correcting windows error
Jul 17, 2024
bbef43d
Some more refactoring
Jul 17, 2024
88fde77
Correcting GPU compilation errors
Jul 17, 2024
92c8c9d
All errors resolved
Jul 17, 2024
c6fe6dc
Merge remote-tracking branch 'upstream/development' into ActuatorDisk
Jul 17, 2024
fa3c78d
Removing unwanted lines
Jul 17, 2024
4f64f72
Merge branch 'development' into ActuatorDisk
AMLattanzi Jul 22, 2024
66e672f
Merge branch 'development' into ActuatorDisk
asalmgren Jul 22, 2024
aa130c4
Merge branch 'development' into ActuatorDisk
AMLattanzi Jul 22, 2024
68a872e
Merge branch 'development' into ActuatorDisk
AMLattanzi Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CMake/BuildERFExe.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ function(build_erf_lib erf_lib_name)
${SRC_DIR}/Microphysics/Kessler/Init_Kessler.cpp
${SRC_DIR}/Microphysics/Kessler/Kessler.cpp
${SRC_DIR}/Microphysics/Kessler/Update_Kessler.cpp
${SRC_DIR}/WindFarmParametrization/Fitch/AdvanceFitch.cpp
${SRC_DIR}/WindFarmParametrization/EWP/AdvanceEWP.cpp
${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/AdvanceSimpleAD.cpp
${SRC_DIR}/LandSurfaceModel/SLM/SLM.cpp
${SRC_DIR}/LandSurfaceModel/MM5/MM5.cpp
)
Expand Down Expand Up @@ -233,7 +236,12 @@ function(build_erf_lib erf_lib_name)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/Null)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/SAM)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/Kessler)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/Microphysics/Kessler)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/WindFarmParametrization)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/WindFarmParametrization/Null)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/WindFarmParametrization/Fitch)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/WindFarmParametrization/EWP)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/LandSurfaceModel)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/LandSurfaceModel/Null)
target_include_directories(${erf_lib_name} PUBLIC ${SRC_DIR}/LandSurfaceModel/SLM)
Expand Down
2 changes: 0 additions & 2 deletions Exec/EWP/inputs_WindFarm_lat_lon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ erf.pbl_type = "None"

erf.init_type = "uniform"

erf.windfarm_type = "EWP"

# PROBLEM PARAMETERS
prob.rho_0 = 1.0
prob.A_0 = 1.0
Expand Down
4 changes: 1 addition & 3 deletions Exec/EWP/inputs_WindFarm_x_y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ geometry.prob_extent = 200150 202637 1000
amr.n_cell = 50 50 40

# WINDFARM PARAMETRIZATION PARAMETERS
erf.windfarm_type = "Fitch"
erf.windfarm_type = "EWP"
erf.windfarm_loc_type = "x_y"
erf.windfarm_loc_table = "windturbines_loc_x_y_WindFarm.txt"
erf.windfarm_spec_table = "windturbines_spec_WindFarm.tbl"
Expand Down Expand Up @@ -70,8 +70,6 @@ erf.pbl_type = "None"

erf.init_type = "uniform"

erf.windfarm_type = "EWP"

# PROBLEM PARAMETERS
prob.rho_0 = 1.0
prob.A_0 = 1.0
Expand Down
70 changes: 0 additions & 70 deletions Exec/EWP/plot_profiles.py
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions Exec/Fitch/README
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions Exec/Fitch/inputs_Fitch
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions Exec/Fitch/inputs_Fitch_LargeDomain
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions Exec/Fitch/plot_profiles.py
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions Exec/Fitch/wind-turbine-1.tbl
View file
Open in desktop

This file was deleted.

Loading
Loading