Skip to content

Commit

Permalink
Some typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
misi9170 committed Oct 7, 2024
1 parent 0516914 commit 20677e0
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 51 deletions.
2 changes: 1 addition & 1 deletion docs/advanced_concepts.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"# Advanced Concepts\n",
"\n",
"More information regarding the numerical and computational formulation in FLORIS\n",
"are detailed here. See [](concepts_intro) for a guide on the basics."
"are detailed here. See [Introductory Concepts](intro_concepts) for a guide on the basics."
]
},
{
Expand Down
62 changes: 22 additions & 40 deletions docs/floris_models.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/intro_concepts.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "86e53920",
"metadata": {},
"source": [
"(concepts_intro)=\n",
"(intro_concepts)=\n",
"# Introductory Concepts\n",
"\n",
"FLORIS is a Python-based software library for calculating wind farm performance considering\n",
Expand Down
18 changes: 9 additions & 9 deletions examples/009_parallel_models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""Example 9: Parallel Models
This example demonstrates how to use the ParFlorisModel class to parallelize the
calculation of the FLORIS model. ParFlorisModel inherits from the FlorisModel
and so can be used in the same way with a consistent interface.The ParFlorisModel
replaces the ParallelFlorisModel
calculation of the FLORIS model. ParFlorisModel inherits from the FlorisModel
and so can be used in the same way with a consistent interface. ParFlorisModel
replaces the ParallelFlorisModel, which will be deprecated in a future release.
"""

Expand All @@ -23,21 +23,21 @@
# Instantiate the FlorisModel
fmodel = FlorisModel("inputs/gch.yaml")

# The ParFlorisModel can be instatiated either from a FlorisModel or from
# The ParFlorisModel can be instantiated either from a FlorisModel or from
# the input file.
pfmodel_1 = ParFlorisModel("inputs/gch.yaml") # Via input file
pfmodel_2 = ParFlorisModel(fmodel) # Via FlorisModel

# The ParFlorisModel has additional inputs which define the parallelization
# but don't effect the output.
# but don't affect the output.
pfmodel_3 = ParFlorisModel(
fmodel,
interface="multiprocessing", # Default
max_workers=2, # Defaults to num_cpu
n_wind_condition_splits=2, # Defaults to max_workers)
n_wind_condition_splits=2, # Defaults to max_workers
)

# Define a simple inflow with just 1 wind speed
# Define a simple inflow
time_series = TimeSeries(
wind_speeds=np.arange(1, 25, 0.5), wind_directions=270.0, turbulence_intensities=0.06
)
Expand Down Expand Up @@ -72,8 +72,8 @@
f"close: {np.allclose(powers_fmodel, powers_pfmodel_3)}"
)

# Given that ParFlorisModel is a subclass of FlorisModel, it can also be used as
# an input to the UncertainFlorisModel class. This allows for parallelization of
# Because ParFlorisModel is a subclass of FlorisModel, it can also be used as
# an input to the UncertainFlorisModel class. This allows for parallelization of
# the uncertainty calculations.
ufmodel = UncertainFlorisModel(fmodel)
pufmodel = UncertainFlorisModel(pfmodel_1)
Expand Down

0 comments on commit 20677e0

Please sign in to comment.