Merge branch 'CURENT:master' into master

Author: eejyin

.DS_Store

@@ -21,6 +21,7 @@ concurrency:
 
 jobs:
   build:
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -66,6 +67,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
 
   deploy:
+    if: github.ref == 'refs/heads/master'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Test Build and Deploy
+name: Test Build
 
 on:
   pull_request:
@@ -59,14 +59,3 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
-
-  test-deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: test-build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.github/workflows/test.yml

@@ -14,42 +14,47 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    bigdecimal (3.1.8)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
     colorator (1.1.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
+    csv (3.3.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.3.0)
-      net-http
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    google-protobuf (4.28.2-arm64-darwin)
+    google-protobuf (4.30.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.28.2-x86_64-linux)
+    google-protobuf (4.30.1-x86_64-linux)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.4)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
+      json (~> 2.6)
       kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
       rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
@@ -62,24 +67,24 @@ GEM
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (3.0.0)
-      sass-embedded (~> 1.54)
+    jekyll-sass-converter (3.1.0)
+      sass-embedded (~> 1.75)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.7.2)
-    kramdown (2.4.0)
-      rexml
+    json (2.10.2)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
+    logger (1.6.6)
     mercenary (0.4.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -91,21 +96,21 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.8)
-    rouge (4.4.0)
+    rexml (3.4.1)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.80.2-arm64-darwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.80.2-x86_64-linux-gnu)
-      google-protobuf (~> 4.28)
+    sass-embedded (1.86.0-arm64-darwin)
+      google-protobuf (~> 4.30)
+    sass-embedded (1.86.0-x86_64-linux-gnu)
+      google-protobuf (~> 4.30)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
-    uri (0.13.1)
-    webrick (1.8.2)
+    uri (1.0.3)
+    webrick (1.9.1)
 
 PLATFORMS
   arm64-darwin

Gemfile.lock

@@ -107,7 +107,7 @@ social:
 analytics:
   provider               : google # false (default), "google", "google-universal", "google-gtag", "custom"
   google:
-    tracking_id          : Vk0IOJ2jwG_qEoG7fuEXYqv0m2rLa8P778Fi_GrsgEQ
+    tracking_id          : G-5R91XH96PB
     anonymize_ip         : # true, false (default)
 
 # Site Author

_config.yml

@@ -22,25 +22,18 @@ Hybrid power plants (HPPs) present a promising solution to address the significa
 
 ## Demonstration
 
-The multi-timescale framework comprises three modules that engage in bidirectional interaction with HPP: HPP Integrated DAUC, HPP Integrated RTED, and AGC controller, as shown in Fig. 1.
-<figure style="text-align: center;">
-  <img src="/assets/images/showcase/DrXinFang-OAJPE-Hybrid-power-plants/HPP.png" alt="HPP-framework" style="width:50%;height:50%;">
-  <figcaption>Fig 1: Integrative operation framework for HPP</figcaption>
+<figure>
+  <img src="/assets/images/showcase/hpp-providing-sfr/hpp.png" alt="HPP-framework" style="width:75%;height:75%;">
+  <figcaption>Fig 1: Integrative operation framework for HPP. (from the paper)</figcaption>
 </figure>
 
 To validate the effectiveness of the proposed framework, case studies are performed on the modified IEEE 39-bus system with three HPPs, as shown in Fig. 2
 
-<figure style="text-align: center;">
-  <img src="/assets/images/showcase/DrXinFang-OAJPE-Hybrid-power-plants/IEEE39.png" alt="HPP-IEEE39" style="width:50%;height:50%;">
-  <figcaption>Fig 2: Modified IEEE 39-bus test system</figcaption>
+<figure>
+  <img src="/assets/images/showcase/hpp-providing-sfr/IEEE39.png" alt="HPP-IEEE39" style="width:75%;height:75%;">
+  <figcaption>Fig 2: Modified IEEE 39-bus test system. (from the paper)</figcaption>
 </figure>
 
-## Case file
-
-Click [here](https://github.com/CURENT/demo/blob/master/demo/data/case/ieee123_andes_REGCV1.xlsx) to downlaod the [ANDES](https://docs.andes.app/en/latest/) case file, which consatins the complete dynamic parameters used for demonstration.
-
-Click [here](https://github.com/CURENT/demo/blob/master/demo/data/case/ieee123_ams_REGCV1.xlsx) to downlaod the [AMS](https://ltb.readthedocs.io/projects/ams/en/latest/) case file, which consatins the economic data used for demonstration.
-
 ## Recommended Citation
 
 Y. Deng, X. Fang, N. Gao and J. Tan, "Multi-Timescale Modeling Framework of Hybrid Power Plants Providing Secondary Frequency Regulation," in IEEE Open Access Journal of Power and Energy, doi: [10.1109/OAJPE.2024.3504835](https://ieeexplore.ieee.org/document/10764748).

_showcase/DrXinFang-OAJPE-Hybrid-power-plants.md renamed to _showcase/hpp-providing-sfr.md

@@ -151,6 +151,10 @@ <h2>Design Philosophy</h2>
                 in IEEE Transactions on Power Systems, vol. 36, no. 2, pp. 1373-1384, March 2021, doi: 10.1109/TPWRS.2020.3017019.
                 <span class="__dimensions_badge_embed__" data-doi="10.1109/TPWRS.2020.3017019" data-style="small_rectangle"></span>  
             </li>
+            <li>J. Wang et al., "Dynamics-incorporated Modeling Framework for Stability Constrained Scheduling Under High-penetration of Renewable
+                Energy," in IEEE Transactions on Sustainable Energy, doi: 10.1109/TSTE.2025.3528027.              
+                <span class="__dimensions_badge_embed__" data-doi="10.1109/TSTE.2025.3528027" data-style="small_rectangle"></span>  
+            </li>
             <li>N. Parsly, J. Wang, N. West, Q. Zhang, H. Cui and F. Li, "DiME and AGVis: A Distributed Messaging Environment and Geographical
                 Visualizer for Large-Scale Power System Simulation," 2023 North American Power Symposium (NAPS), Asheville, NC, USA, 2023, pp. 1-5,
                 doi: 10.1109/NAPS58826.2023.10318583.