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

Jump to bottom

abiy - fixed bugs in isolated building cfd model create dict file pyt… #347

Merged
merged 1 commit into from
Nov 2, 2024
Merged

abiy - fixed bugs in isolated building cfd model create dict file pyt… #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 1 addition & 20 deletions modules/createEVENT/IsolatedBuildingCFD/setup_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,7 +1986,6 @@ def write_boundary_data_files(input_json_path, case_path):
foam.write_foam_field(wind_profiles[:, 8:17], bd_path + 'L')


<<<<<<< HEAD
def write_vtk_plane_file(input_json_path, template_dict_path, case_path):

#Read JSON data
Expand Down Expand Up @@ -2086,9 +2085,6 @@ def write_vtk_plane_file(input_json_path, template_dict_path, case_path):

if __name__ == '__main__': # noqa: W291
# noqa: W293
=======
if __name__ == '__main__':
>>>>>>> upstream/master
input_args = sys.argv

# Set filenames
Expand Down Expand Up @@ -2135,18 +2131,9 @@ def write_vtk_plane_file(input_json_path, template_dict_path, case_path):
# Write results to be monitored
write_base_forces_file(input_json_path, template_dict_path, case_path)
write_story_forces_file(input_json_path, template_dict_path, case_path)
<<<<<<< HEAD
write_generated_pressure_probes_file(input_json_path, template_dict_path, case_path)
write_imported_pressure_probes_file(input_json_path, template_dict_path, case_path)
write_vtk_plane_file(input_json_path, template_dict_path, case_path)
=======
write_generated_pressure_probes_file(
input_json_path, template_dict_path, case_path
)
write_imported_pressure_probes_file(
input_json_path, template_dict_path, case_path
)
>>>>>>> upstream/master

# Write fvSolution dict
write_fvSolution_file(input_json_path, template_dict_path, case_path)
Expand All @@ -2170,10 +2157,4 @@ def write_vtk_plane_file(input_json_path, template_dict_path, case_path):
# write_DFSRTurbDict_file(input_json_path, template_dict_path, case_path)

# Write TInf files
write_boundary_data_files(input_json_path, case_path)
<<<<<<< HEAD


# noqa: W293
=======
>>>>>>> upstream/master
write_boundary_data_files(input_json_path, case_path)
Loading