Merge pull request #289 from RHammond2/patch/naming_conventions

Patch: Update unchanged reference and add check for Pandas warning
NREL · May 24, 2024 · 47ca939 · 47ca939
2 parents 692e86e + 39beadc
commit 47ca939
Show file tree

Hide file tree

Showing 24 changed files with 4,420 additions and 4,381 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -23,9 +23,9 @@ jobs:
         python-version: [3.9, 3.11]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -38,4 +38,4 @@ jobs:
         pytest --cov=openoa --cov-report=xml
       shell: bash
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -14,9 +14,9 @@ jobs:
     if: github.event.action == 'published'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Build package

diff --git a/examples/00_intro_to_plant_data.ipynb b/examples/00_intro_to_plant_data.ipynb
diff --git a/examples/01_utils_examples.ipynb b/examples/01_utils_examples.ipynb
diff --git a/examples/02a_plant_aep_analysis.ipynb b/examples/02a_plant_aep_analysis.ipynb
diff --git a/examples/02b_plant_aep_analysis_cubico.ipynb b/examples/02b_plant_aep_analysis_cubico.ipynb
diff --git a/examples/02c_augmented_plant_aep_analysis.ipynb b/examples/02c_augmented_plant_aep_analysis.ipynb
diff --git a/examples/03_turbine_ideal_energy.ipynb b/examples/03_turbine_ideal_energy.ipynb
diff --git a/examples/04_electrical_losses.ipynb b/examples/04_electrical_losses.ipynb
diff --git a/examples/05_eya_gap_analysis.ipynb b/examples/05_eya_gap_analysis.ipynb
diff --git a/examples/06_wake_loss_analysis.ipynb b/examples/06_wake_loss_analysis.ipynb
diff --git a/examples/07_static_yaw_misalignment.ipynb b/examples/07_static_yaw_misalignment.ipynb
diff --git a/openoa/analysis/aep.py b/openoa/analysis/aep.py
@@ -1321,7 +1321,7 @@ def plot_reanalysis_gross_energy_data(
             for name, df in self.plant.reanalysis.items():
                 x = valid_aggregate[name]
                 y = valid_aggregate["gross_energy_gwh"]
-                plant_capac = self.plant.metadata.capacity / 1000.0 * self._hours_in_res
+                plant_capac = self.plant.metadata.capacity / 1000.0 * self.resample_hours
 
                 # Apply bin filter
                 flag = filters.bin_filter(

diff --git a/openoa/utils/timeseries.py b/openoa/utils/timeseries.py
@@ -207,9 +207,10 @@ def gap_fill_data_frame(data: pd.DataFrame, dt_col: str, freq: str) -> pd.DataFr
     if data.shape[0] == 0:
         return data
 
-    gap_df = pd.DataFrame(columns=data.columns)
-    gap_df[dt_col] = find_time_gaps(data[dt_col], freq)
-    if gap_df.size > 0:
+    missing_dt = find_time_gaps(data[dt_col], freq)
+    if (not missing_dt.empty) and missing_dt.notnull().any():
+        gap_df = pd.DataFrame(columns=data.columns)
+        gap_df[dt_col] = missing_dt
         data = pd.concat([data, gap_df], axis=0)
     try:
         return data.sort_values(dt_col)

diff --git a/sphinx/examples/00_intro_to_plant_data.ipynb b/sphinx/examples/00_intro_to_plant_data.ipynb
diff --git a/sphinx/examples/01_utils_examples.ipynb b/sphinx/examples/01_utils_examples.ipynb
diff --git a/sphinx/examples/02a_plant_aep_analysis.ipynb b/sphinx/examples/02a_plant_aep_analysis.ipynb
diff --git a/sphinx/examples/02b_plant_aep_analysis_cubico.ipynb b/sphinx/examples/02b_plant_aep_analysis_cubico.ipynb
diff --git a/sphinx/examples/02c_augmented_plant_aep_analysis.ipynb b/sphinx/examples/02c_augmented_plant_aep_analysis.ipynb
diff --git a/sphinx/examples/03_turbine_ideal_energy.ipynb b/sphinx/examples/03_turbine_ideal_energy.ipynb
diff --git a/sphinx/examples/04_electrical_losses.ipynb b/sphinx/examples/04_electrical_losses.ipynb
diff --git a/sphinx/examples/05_eya_gap_analysis.ipynb b/sphinx/examples/05_eya_gap_analysis.ipynb
diff --git a/sphinx/examples/06_wake_loss_analysis.ipynb b/sphinx/examples/06_wake_loss_analysis.ipynb
diff --git a/sphinx/examples/07_static_yaw_misalignment.ipynb b/sphinx/examples/07_static_yaw_misalignment.ipynb