Skip to content

Commit

Permalink
Merge Split Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Automatic preview publish committed Mar 12, 2024
2 parents d24c63a + 1ac5dd8 commit ec0c723
Show file tree
Hide file tree
Showing 434 changed files with 9,457 additions and 7,480 deletions.
28 changes: 14 additions & 14 deletions preview-update-submodules/404.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,9 @@
<div class="d-none d-lg-block col-lg-4">
<div class="card h-100">
<div class="card-body d-flex flex-column">
<h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules/featured-users/2024-01-17-tribalcollege.html">Tribal College and CHTC pursue opportunities to expand computing education and infrastructure</a></h3>
<h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules/news/HTC24/">Save the Dates for Throughput Computing 2024</a></h3>
<div>
<span class="text-muted">January 17, 2024</span>
<span class="text-muted">March 7, 2024</span>
</div>
<hr/>
<a href="/web-preview/preview-update-submodules/new.html">
Expand Down Expand Up @@ -578,16 +578,16 @@ <h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-26-california-megafires.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-03-05-astronomers-engineers-use-grid-of-computers.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Ecologists utilizing HTC to examine the effects of megafires on wildlife
Astronomers and Engineers Use a Grid of Computers at a National Scale to Study the Universe 300 Times Faster
</h6>
<div>
<span class="text-muted text-decoration-none">February 26, 2024</span>
<span class="text-muted text-decoration-none">March 5, 2024</span>
</div>
</div>
</div>
Expand All @@ -600,16 +600,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-06-gis-story.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-26-california-megafires.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Preserving historic Wisconsin aerial photos with a little help from CHTC
Ecologists utilizing HTC to examine the effects of megafires on wildlife
</h6>
<div>
<span class="text-muted text-decoration-none">February 6, 2024</span>
<span class="text-muted text-decoration-none">February 26, 2024</span>
</div>
</div>
</div>
Expand All @@ -622,16 +622,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-12-20-OSG-School.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-06-gis-story.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
OSG School mission: Don’t let computing be a barrier to research
Preserving historic Wisconsin aerial photos with a little help from CHTC
</h6>
<div>
<span class="text-muted text-decoration-none">December 20, 2023</span>
<span class="text-muted text-decoration-none">February 6, 2024</span>
</div>
</div>
</div>
Expand All @@ -644,16 +644,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-11-27-adjacent-tissues-paper.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-12-20-OSG-School.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Using HTC expanded scale of research using noninvasive measurements of tendons and ligaments
OSG School mission: Don’t let computing be a barrier to research
</h6>
<div>
<span class="text-muted text-decoration-none">November 27, 2023</span>
<span class="text-muted text-decoration-none">December 20, 2023</span>
</div>
</div>
</div>
Expand Down
28 changes: 14 additions & 14 deletions preview-update-submodules/HTCondorWeek2022/participants.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,9 @@
<div class="d-none d-lg-block col-lg-4">
<div class="card h-100">
<div class="card-body d-flex flex-column">
<h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules/featured-users/2024-01-17-tribalcollege.html">Tribal College and CHTC pursue opportunities to expand computing education and infrastructure</a></h3>
<h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules/news/HTC24/">Save the Dates for Throughput Computing 2024</a></h3>
<div>
<span class="text-muted">January 17, 2024</span>
<span class="text-muted">March 7, 2024</span>
</div>
<hr/>
<a href="/web-preview/preview-update-submodules/new.html">
Expand Down Expand Up @@ -578,16 +578,16 @@ <h3><a class="text-decoration-none" href="/web-preview/preview-update-submodules
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-26-california-megafires.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-03-05-astronomers-engineers-use-grid-of-computers.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Ecologists utilizing HTC to examine the effects of megafires on wildlife
Astronomers and Engineers Use a Grid of Computers at a National Scale to Study the Universe 300 Times Faster
</h6>
<div>
<span class="text-muted text-decoration-none">February 26, 2024</span>
<span class="text-muted text-decoration-none">March 5, 2024</span>
</div>
</div>
</div>
Expand All @@ -600,16 +600,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-06-gis-story.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-26-california-megafires.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Preserving historic Wisconsin aerial photos with a little help from CHTC
Ecologists utilizing HTC to examine the effects of megafires on wildlife
</h6>
<div>
<span class="text-muted text-decoration-none">February 6, 2024</span>
<span class="text-muted text-decoration-none">February 26, 2024</span>
</div>
</div>
</div>
Expand All @@ -622,16 +622,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-12-20-OSG-School.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2024-02-06-gis-story.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
OSG School mission: Don’t let computing be a barrier to research
Preserving historic Wisconsin aerial photos with a little help from CHTC
</h6>
<div>
<span class="text-muted text-decoration-none">December 20, 2023</span>
<span class="text-muted text-decoration-none">February 6, 2024</span>
</div>
</div>
</div>
Expand All @@ -644,16 +644,16 @@ <h6 class="text-decoration-none mb-1">
<div class="my-2">


<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-11-27-adjacent-tissues-paper.html">
<a class="text-decoration-none d-block hover-border rounded h-100" href="/web-preview/preview-update-submodules/featured-users/2023-12-20-OSG-School.html">


<div class="card border-0 ">
<div class="p-2 d-flex flex-column">
<h6 class="text-decoration-none mb-1">
Using HTC expanded scale of research using noninvasive measurements of tendons and ligaments
OSG School mission: Don’t let computing be a barrier to research
</h6>
<div>
<span class="text-muted text-decoration-none">November 27, 2023</span>
<span class="text-muted text-decoration-none">December 20, 2023</span>
</div>
</div>
</div>
Expand Down
15 changes: 6 additions & 9 deletions preview-update-submodules/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,22 @@ Grab the **htcondor/web** image from our Docker Hub:
docker pull dockerreg.chtc.wisc.edu:443/htcondor/web
```

## Building the website
### Run Docker Manually

**Make sure you have pulled submodules before building, otherwise you will be missing files and your build will break.**

After making changes to the Jekyll source files, use the Docker image to preview your changes. Run the following from your computer while inside the checked-out copy of the website source:
At the website root:

```
docker run -p 8000:8000 --rm --volume $PWD:/srv/jekyll -it jekyll/jekyll:latest /bin/sh
docker run -it -p 8002:8000 -v $PWD:/app -w /app ruby:2.7 /bin/bash
```

This will utilize the latest Jekyll version and map port `8000` to your host. Within the container, a small HTTP server can be started with the following command:

```
jekyll serve --watch -H 0.0.0.0 -P 8000
bundle install
bundle exec jekyll serve --watch --config _config.yml -H 0.0.0.0 -P 8000
```

This will build and serve the website; it can be viewed by navigating your web browser to <http://localhost:8000>.

With the `--watch` flag set, any changes you make to the website source will cause a new version of the website to be built; it takes 500 seconds on a M1 processor between hitting "Save" and then "Refresh" on the website.
https://localhost:8002


## Previewing Branches
Expand Down
2 changes: 1 addition & 1 deletion preview-update-submodules/assets/css/homepage.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added preview-update-submodules/assets/images/Throughput-Computing-2024-BannerCHTC.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 53 additions & 10 deletions preview-update-submodules/assets/js/pages/user-map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,57 @@ function getScale(zoom){
return defaultIconScale * (.5 + (.03*zoom))
}

function create_marker(location, iconScale){
return [...Array(9).keys()]
.map(x => x-5)
.map(x => L.marker([location[0], location[1] + (x*360)], {icon: getIcon(iconScale)}))
function create_marker(location, iconScale, title){
// Define jitter in degrees, 10 miles is approximately 1/69 degrees of latitude
const jitterRangeLat = 10 / 69;
// Longitude varies, use the cosine of the latitude (in radians)
const jitterRangeLng = jitterRangeLat / Math.cos(location[0] * Math.PI / 180);

// Create an array to hold the markers
let markers = [];

// Adjust this value if you want more or fewer markers
const numberOfMarkers = 1; // For example, if you only want one marker per location

for (let i = 0; i < numberOfMarkers; i++) {
// Generate a random jitter within the range for latitude and longitude
const jitterLat = (Math.random() - 0.5) * jitterRangeLat;
const jitterLng = (Math.random() - 0.5) * jitterRangeLng;

// Apply jitter and ensure the latitude and longitude are within bounds
const newLat = Math.min(Math.max(location[0] + jitterLat, -90), 90);
const newLng = ((location[1] + jitterLng + 180) % 360) - 180;

// Create a marker with jitter applied and add it to the array
const marker = L.marker([newLat, newLng], {icon: getIcon(iconScale)});
if(title) {
marker.bindPopup(title);
}
markers.push(marker);
}

// Return the array of markers
return markers;
}


async function get_spreadsheet_values(){
let res = await fetch("https://chtc.github.io/data-cache/data/htcss_user_registry.csv")

let text = await res.text()

let data = Papa.parse(text, {header:true})

let geocodes = data['data'].map(x => [parseFloat(x['Longitude']), parseFloat(x['Latitude'])])
let geocodes = data['data'].map(x => {
return {
longitude: parseFloat(x['Longitude']),
latitude: parseFloat(x['Latitude']),
...x
}
})

let cleanGeocodes = geocodes.reduce((p, c) => {
if(isNaN(c[0]) || isNaN(c[1])){
if(isNaN(c['latitude']) || isNaN(c['longitude'])) {
return p
}
p.push(c)
Expand All @@ -52,7 +86,16 @@ async function get_spreadsheet_values(){
async function get_manual_values() {
let response = await fetch("/web-preview/preview-update-submodules/assets/data/htcss-users.json")

return response.json()
let data = await response.json()

let geocodes = data.map(x => {
return {
longitude: parseFloat(x[0]),
latitude: parseFloat(x[1])
}
})

return geocodes
}

class UserMap {
Expand Down Expand Up @@ -90,15 +133,15 @@ class UserMap {
document.getElementById("org-count").textContent = this.markerCount
}

addIcon([longitude, latitude]) {
const markers = create_marker([longitude, latitude], getScale(this.zoom))
addIcon(coordinates, title) {
const markers = create_marker(coordinates, getScale(this.zoom), title)
markers.forEach(x => this.markerLayer.addLayer(x))
}


async addIcons(getter) {
let iconLocations = await getter()
iconLocations.forEach(x => this.addIcon(x))
iconLocations.forEach(x => this.addIcon([x['longitude'], x['latitude']], x['Organization Name ( Optional: Add if you want displayed ) ']))
this.updateMarkerCount(iconLocations.length)
}
}
Expand Down
Loading

0 comments on commit ec0c723

Please sign in to comment.