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.

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

Shorten actuator disk model names #1903

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Source/DataStructs/ERF_DataStruct.H
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ AMREX_ENUM(MoistureType,
);

AMREX_ENUM(WindFarmType,
Fitch, EWP, SimpleActuatorDisk, GeneralActuatorDisk, None
Fitch, EWP, SimpleAD, GeneralAD, None
);

AMREX_ENUM(WindFarmLocType,
Expand Down Expand Up @@ -393,14 +393,14 @@ struct SolverChoice {
//
// Wind farm checks
//
if (windfarm_type==WindFarmType::SimpleActuatorDisk and sampling_distance_by_D < 0.0) {
if (windfarm_type==WindFarmType::SimpleAD and sampling_distance_by_D < 0.0) {
amrex::Abort("To use simplified actuator disks, you need to provide a variable"
" erf.sampling_distance_by_D in the inputs which specifies the upstream"
" distance as a factor of the turbine diameter at which the incoming free stream"
" velocity will be computed at.");
}
if ( (windfarm_type==WindFarmType::SimpleActuatorDisk ||
windfarm_type==WindFarmType::GeneralActuatorDisk ) && turb_disk_angle < 0.0) {
if ( (windfarm_type==WindFarmType::SimpleAD ||
windfarm_type==WindFarmType::GeneralAD ) && turb_disk_angle < 0.0) {
amrex::Abort("To use simplified actuator disks, you need to provide a variable"
" erf.turb_disk_angle_from_x in the inputs which is the angle of the face of the"
" turbine disk from the x-axis. A turbine facing an oncoming flow in the x-direction"
Expand Down
Loading