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

Develop #38

Merged
merged 12 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@ DEPENDENCIES
listen

BUNDLED WITH
1.17.1
2.5.22
95 changes: 70 additions & 25 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<head>
<!-- Other HTML head elements -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" />
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
</head>

<style>
Expand Down Expand Up @@ -98,7 +100,6 @@
<div class="row">
<div class="small-24 columns">
<h1 style="text-align: center;"></h1>
<!-- <img src="/images/CURENT_Logo_FullOnWhite.png" class="logo" alt="CURENT logo"> -->
</div><!-- /.medium-4.columns -->
</div><!-- /.row -->
</div><!-- /#header-home -->
Expand All @@ -107,20 +108,18 @@ <h1 style="text-align: center;"></h1>

<div class="row">
<div class="small-24 columns" style="text-align: center;">
<img src="images/CURENT_Logo_FullOnWhite.png";
alt="CURENT";
style="float:center";
margin-left:100px;
width="600"; height: auto;>
<a href="https://curent.utk.edu/" target="_blank">
<img src="images/CURENT_Logo.png";
alt="CURENT";
style="float:center"; margin-left:100px; width="600"; height: auto;>
</p>
</div>
</div>

<div class="row">
<div class="small-12 columns" style="text-align: center;">
<p style="font-size: 60px;
font-family: Monaco;">
Large-scale Testbed
<p style="font-size: 60px; font-family: Monaco;">
Large-scale Testbed
</p>
</div>
<div class="small-12 columns" style="text-align: center;">
Expand Down Expand Up @@ -153,12 +152,12 @@ <h3 style="font-family: 'Bebas Neue', Monaco;">Try It Now!</h3>
<h2>Overview</h2>
<p>The CURENT Large-scale Testbed (LTB) is a state-of-the-art research facility designed for rapid prototyping of power systems.
It is a tightly integrated, closed-loop platform consisting of four major independent packages:
<b><i>ANDES</i></b> for dynamic simulation,
<b><i>AMS</i></b> for dispatch simulation,
<b><i>AGVis</i></b> for grid visualization,
<b><i>ANDES</i></b> for transient stability modeling and simulation,
<b><i>AMS</i></b> for scheduling modeling and simulation,
<b><i>AGVis</i></b> for grid geographical visualization,
and <b><i>DiME</i></b> for distributed messaging environment.
These LTB packages can be used individually or in a federated manner, making it a versatile and comprehensive platform for power system research
and development.
These LTB packages can work independently while being interopereable with each other, making it a versatile and comprehensive
platform for power system research and development.
</p>

<h2>Getting Started</h2>
Expand All @@ -168,19 +167,26 @@ <h2>Getting Started</h2>

<h2>Design Philosophy</h2>
<p>The purpose of LTB is to offer a rapid prototyping environment for power system research and development.
We kindly ask that you cite the following papers if LTB is used in your research.
<ol>
<li>F. Li, K. Tomsovic and H. Cui, "A Large-Scale Testbed as a Virtual Power Grid: For Closed-Loop Controls in Research and Testing,"
in IEEE Power and Energy Magazine, vol. 18, no. 2, pp. 60-68, March-April 2020, doi: 10.1109/MPE.2019.2959054.</li>
<li>H. Cui, F. Li and K. Tomsovic, "Hybrid Symbolic-Numeric Framework for Power System Modeling and Analysis,"
in IEEE Transactions on Power Systems, vol. 36, no. 2, pp. 1373-1384, March 2021, doi: 10.1109/TPWRS.2020.3017019.</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.</li>
</ol>
We kindly ask that you cite the following papers if LTB is used in your research.
<ol>
<li>F. Li, K. Tomsovic and H. Cui, "A Large-Scale Testbed as a Virtual Power Grid: For Closed-Loop Controls in Research and Testing,"
in IEEE Power and Energy Magazine, vol. 18, no. 2, pp. 60-68, March-April 2020, doi: 10.1109/MPE.2019.2959054.
<span class="__dimensions_badge_embed__" data-doi="10.1109/MPE.2019.2959054" data-style="small_rectangle"></span>
</li>
<li>H. Cui, F. Li and K. Tomsovic, "Hybrid Symbolic-Numeric Framework for Power System Modeling and Analysis,"
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>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.
<span class="__dimensions_badge_embed__" data-doi="10.1109/NAPS58826.2023.10318583" data-style="small_rectangle"></span>
</li>
</ol>
</p>
<script async src="https://badge.dimensions.ai/badge.js" charset="utf-8"></script>

<h2>PARTNERS & USERS</h2>
<h2>Partners & Users</h2>
<div class="logo-container">
<div class="partner-logo2">
<img src="/images/logos/CURENT.png"; alt="CURENT";>
Expand Down Expand Up @@ -229,4 +235,43 @@ <h2>PARTNERS & USERS</h2>
</div>
</div>

<div class="row">
<h2>Impact Map</h2>
<div id="map" style="height: 500px; width: 1000px; margin: 0 auto; border: 1px solid #ccc;"></div>

<script>
// Initialize the map with a global view
var map = L.map('map').setView([20, 0], 2);

// Add a tile layer to the map (OpenStreetMap tiles)
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);

// Load GeoJSON data from an external file
fetch('./../mapdata.json')
.then(response => response.json())
.then(data => {
// Add GeoJSON data with popups
L.geoJSON(data, {
onEachFeature: function (feature, layer) {
if (feature.properties && feature.properties.name) {
layer.bindPopup(feature.properties.name);
}
}
}).addTo(map);
})
.catch(error => console.error('Error loading GeoJSON data:', error));

// Mark UTK with a red marker
var redMarker = L.AwesomeMarkers.icon({
icon: 'circle',
markerColor: 'red',
prefix: 'fa'
});

</script>

</div>

</body>
19 changes: 10 additions & 9 deletions _layouts/team.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@ <h3><a href="http://web.eecs.utk.edu/~fli6/" target="_blank">Dr. Fran Li</a></h3
<img src="/images/teams/KTomsovic.jpeg" alt="KTomsovic">
<h3><a href="http://web.eecs.utk.edu/~ktomsovi/" target="_blank">Dr. Kevin Tomsovic</a></h3>
<p>Project Co-lead (since 2015)</p>
<p>University of Tennessee, Knoxville</p>
<p>Clemson University</p>
<p>CURENT Affiliate Faculty</p>
</div>
<div class="team-member">
<img src="/images/teams/HCui.jpeg" alt="HCui">
<h3><a href="https://cui.eecps.com/" target="_blank">Dr. Hantao Cui</a></h3>
<p>Chief Technologist; Author of ANDES</p>
<p>Oklahoma State University</p>
<p>North Carolina State University</p>
<p>CURENT Affiliate Faculty</p>
</div>
</div>
Expand Down Expand Up @@ -88,7 +89,7 @@ <h2>Core Development Team</h2>
<img src="/images/teams/HCui.jpeg" alt="HCui">
<h3><a href="https://cui.eecps.com/" target="_blank">Dr. Hantao Cui</a></h3>
<p>LTB development coordination (2015-2021); ANDES lead developement (since 2018)</p>
<p>Oklahoma State University</p>
<p>North Carolina State University</p>
<p>CURENT Affiliate Faculty</p>
</div>
<div class="team-member">
Expand All @@ -100,25 +101,25 @@ <h3><a href="http://www1.ece.neu.edu/~abur/" target="_blank">Dr. Xin Fang</a></h
</div>
<div class="team-member">
<img src="/images/teams/JWang.jpeg" alt="JWang">
<h3><a href="https://jinningwang.github.io/" target="_blank">Mr. Jinning Wang</a></h3>
<h3><a href="https://jinningwang.github.io/" target="_blank">Jinning Wang</a></h3>
<p>LTB development coordination (since 2021); AMS development (since 2022)</p>
<p>University of Tennessee, Knoxville</p>
</div>
<div class="team-member">
<img src="/images/teams/Zack.jpeg" alt="Zack">
<h3><a href="https://www.linkedin.com/in/zackary-malkmus-4518461b3/" target="_blank">Mr. Zackary Malkmus</a></h3>
<p>DiME and AGVis development (since 2023)</p>
<h3><a href="https://www.linkedin.com/in/zackary-malkmus-4518461b3/" target="_blank">Zackary Malkmus</a></h3>
<p>DiME and AGVis development (2023-2024)</p>
<p>University of Tennessee, Knoxville</p>
</div>
<div class="team-member">
<img src="/images/teams/NParsly.jpeg" alt="NParsly">
<h3><a href="https://www.linkedin.com/in/nicholas-parsly-093076220/" target="_blank">Mr. Nicholas Parsly</a></h3>
<h3><a href="https://www.linkedin.com/in/nicholas-parsly-093076220/" target="_blank">Nicholas Parsly</a></h3>
<p>DiME and AGVis development (2022-2023)</p>
<p>Alumni of University of Tennessee, Knoxville</p>
</div>
<div class="team-member">
<img src="/images/teams/NWest.jpeg" alt="NWest">
<h3><a href="https://www.linkedin.com/in/nicholas-drake-west/" target="_blank">Mr. Nicholas West</a></h3>
<h3><a href="https://www.linkedin.com/in/nicholas-drake-west/" target="_blank">Nicholas West</a></h3>
<p>DiME and AGVis development (2020-2022)</p>
<p>Alumni of University of Tennessee, Knoxville</p>
</div>
Expand All @@ -145,7 +146,7 @@ <h3><a href="https://shebuxin.github.io/" target="_blank">Dr. Buxin She</a></h3>
<div class="team-member">
<img src="/images/teams/HShuai.jpeg" alt="HShuai">
<h3><a href="https://sites.google.com/view/hangshuai/home?authuser=0" target="_blank">Dr. Hang Shuai</a></h3>
<p>University of Tennessee, Knoxville</p>
<p>Alumni of University of Tennessee, Knoxville</p>
</div>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions _sass/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";

// This is the default html and body font-size for the base rem value.
$rem-base: 16px !default;

Expand Down Expand Up @@ -44,7 +46,7 @@ $modules: () !default;
// STRIP UNIT
// It strips the unit of measure and returns it
@function strip-unit($num) {
@return $num / ($num * 0 + 1);
@return math.div($num, ($num * 0 + 1));
}

// TEXT INPUT TYPES
Expand Down Expand Up @@ -90,7 +92,7 @@ $modules: () !default;

// CONVERT TO REM
@function convert-to-rem($value, $base-value: $rem-base) {
$value: strip-unit($value) / strip-unit($base-value) * 1rem;
$value: math.div(strip-unit($value), strip-unit($base-value)) * 1rem;
@if ($value == 0rem) { $value: 0; } // Turn 0rem into 0
@return $value;
}
Expand Down
3 changes: 2 additions & 1 deletion _sass/foundation-components/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";
@import "global";

//
Expand All @@ -18,7 +19,7 @@ $accordion-navigation-font-color: $jet !default;
$accordion-navigation-font-size: rem-calc(16) !default;
$accordion-navigation-font-family: $body-font-family !default;

$accordion-content-padding: ($column-gutter/2) !default;
$accordion-content-padding: math.div($column-gutter, 2) !default;
$accordion-content-active-bg-color: $white !default;


Expand Down
3 changes: 2 additions & 1 deletion _sass/foundation-components/_alert-boxes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";
@import "global";

//
Expand Down Expand Up @@ -88,7 +89,7 @@ $alert-transition-ease: ease-out !default;
line-height: 0;
position: absolute;
top: $alert-close-top;
margin-top: -($alert-close-font-size / 2);
margin-top: math.div(-$alert-close-font-size, 2);
#{$opposite-direction}: $alert-close-position;
color: $alert-close-color;
opacity: $alert-close-opacity;
Expand Down
9 changes: 5 additions & 4 deletions _sass/foundation-components/_block-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";
@import "global";

//
Expand Down Expand Up @@ -43,7 +44,7 @@ $block-grid-media-queries: true !default;
@if $align-block-grid-to-grid {
margin: 0;
} @else {
margin: 0 (-$spacing/2);
margin: 0 math.div(-$spacing, 2);
}
@include clearfix;

Expand All @@ -52,16 +53,16 @@ $block-grid-media-queries: true !default;
height: auto;
float: $default-float;
@if $include-spacing {
padding: 0 ($spacing/2) $spacing;
padding: 0 math.div($spacing, 2) $spacing;
}
}
}

@if $per-row {
&>li {
width: 100%/$per-row;
width: math.div(100%, $per-row);
@if $include-spacing {
padding: 0 ($spacing/2) $spacing;
padding: 0 math.div($spacing, 2) $spacing;
}
list-style: none;

Expand Down
3 changes: 2 additions & 1 deletion _sass/foundation-components/_button-groups.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";
@import "global";
@import "buttons";

Expand Down Expand Up @@ -138,7 +139,7 @@ $button-group-border-width: 1px !default;

// We use this to make the buttons even width across their container
@if $even {
width: percentage((100/$even) / 100);
width: percentage(math.div(math.div(100, $even), 100));
button, .button { width: 100%; }
}
}
Expand Down
9 changes: 5 additions & 4 deletions _sass/foundation-components/_dropdown-buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// foundation.zurb.com
// Licensed under MIT Open Source

@use "sass:math";
@import "global";

//
Expand All @@ -22,25 +23,25 @@ $button-pip-lrg: rem-calc(11) !default;
$dropdown-button-padding-tny: $button-pip-tny * 7 !default;
$dropdown-button-pip-size-tny: $button-pip-tny !default;
$dropdown-button-pip-opposite-tny: $button-pip-tny * 3 !default;
$dropdown-button-pip-top-tny: (-$button-pip-tny / 2) + rem-calc(1) !default;
$dropdown-button-pip-top-tny: math.div(-$button-pip-tny, 2) + rem-calc(1) !default;

// We use these to style small dropdown buttons
$dropdown-button-padding-sml: $button-pip-sml * 7 !default;
$dropdown-button-pip-size-sml: $button-pip-sml !default;
$dropdown-button-pip-opposite-sml: $button-pip-sml * 3 !default;
$dropdown-button-pip-top-sml: (-$button-pip-sml / 2) + rem-calc(1) !default;
$dropdown-button-pip-top-sml: math.div(-$button-pip-sml, 2) + rem-calc(1) !default;

// We use these to style medium dropdown buttons
$dropdown-button-padding-med: $button-pip-med * 6 + rem-calc(3) !default;
$dropdown-button-pip-size-med: $button-pip-med - rem-calc(3) !default;
$dropdown-button-pip-opposite-med: $button-pip-med * 2.5 !default;
$dropdown-button-pip-top-med: (-$button-pip-med / 2) + rem-calc(2) !default;
$dropdown-button-pip-top-med: math.div(-$button-pip-med, 2) + rem-calc(2) !default;

// We use these to style large dropdown buttons
$dropdown-button-padding-lrg: $button-pip-lrg * 5 + rem-calc(3) !default;
$dropdown-button-pip-size-lrg: $button-pip-lrg - rem-calc(6) !default;
$dropdown-button-pip-opposite-lrg: $button-pip-lrg * 2.5 !default;
$dropdown-button-pip-top-lrg: (-$button-pip-lrg / 2) + rem-calc(3) !default;
$dropdown-button-pip-top-lrg: math.div(-$button-pip-lrg, 2) + rem-calc(3) !default;

// @mixins
//
Expand Down
Loading
Loading