diff --git a/.github/workflows/delete-preview.yml b/.github/workflows/delete-preview.yml index 42b05abe..e4a18a18 100644 --- a/.github/workflows/delete-preview.yml +++ b/.github/workflows/delete-preview.yml @@ -6,10 +6,10 @@ on: jobs: Delete-Preview-Branch: - if: ${{ github.repository_owner == 'opensciencegrid' }} + if: ${{ github.repository_owner == 'osg-htc' }} runs-on: ubuntu-18.04 env: - preview_url: https://github.com/opensciencegrid/web-preview.git + preview_url: https://github.com/osg-htc/web-preview.git steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 2c532f5c..9dd3337f 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -6,10 +6,10 @@ on: jobs: Deploy-Web-Preview: - if: ${{ github.repository_owner == 'opensciencegrid' }} + if: ${{ github.repository_owner == 'osg-htc' }} runs-on: ubuntu-18.04 env: - preview_url: https://github.com/opensciencegrid/web-preview.git + preview_url: https://github.com/osg-htc/web-preview.git steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/deploy-production-osg-htc.yml b/.github/workflows/deploy-production-opensciencegrid.yml similarity index 74% rename from .github/workflows/deploy-production-osg-htc.yml rename to .github/workflows/deploy-production-opensciencegrid.yml index 66fadc6a..1adf0988 100644 --- a/.github/workflows/deploy-production-osg-htc.yml +++ b/.github/workflows/deploy-production-opensciencegrid.yml @@ -9,12 +9,12 @@ on: jobs: Build-And-Deploy-Production: - if: ${{ github.repository_owner == 'opensciencegrid' }} + if: ${{ github.repository_owner == 'osg-htc' }} runs-on: ubuntu-18.04 env: - CNAME: osg-htc.org - production_url: https://github.com/opensciencegrid/osg-htc.git - OVERRIDE_CONFIG: _config_osg-htc_org.yml + CNAME: opensciencegrid.org + production_url: https://github.com/opensciencegrid/opensciencegrid.github.io + OVERRIDE_CONFIG: _config_opensciencegrid_org.yml steps: - uses: actions/checkout@v2 @@ -24,11 +24,11 @@ jobs: - name: Setup SSH Keys and known_hosts uses: webfactory/ssh-agent@v0.5.3 with: - ssh-private-key: ${{ secrets.OSG_HTC_DEPLOY_KEY }} + ssh-private-key: ${{ secrets.OPENSCIENCEGRID_ORG_DEPLOY_KEY }} - name: Initialize GH User run: | - git config user.name "GitHub Actions" + git config user.name "GitHub Actions " git config user.email "actions@github.com" - uses: ruby/setup-ruby@v1 @@ -50,4 +50,4 @@ jobs: git checkout -b split-branch `git subtree split --prefix _site master` # Push to Production - git push ${{ env.production_url }} HEAD:main --force + git push ${{ env.production_url }} HEAD:from-osg-htc --force diff --git a/.github/workflows/deploy-production-same-repo.yml b/.github/workflows/deploy-production-same-repo.yml index 6f4c0075..ce632437 100644 --- a/.github/workflows/deploy-production-same-repo.yml +++ b/.github/workflows/deploy-production-same-repo.yml @@ -9,10 +9,10 @@ on: jobs: Build-And-Deploy-Production: - if: ${{ github.repository_owner == 'opensciencegrid' }} + if: ${{ github.repository_owner == 'osg-htc' }} runs-on: ubuntu-18.04 env: - CNAME: opensciencegrid.org + CNAME: osg-htc.org OVERRIDE_CONFIG: _config_opensciencegrid_org.yml steps: diff --git a/_about/computation-ideal-for-OSPool.md b/_about/computation-ideal-for-OSPool.md index b986c5fc..f6647d47 100644 --- a/_about/computation-ideal-for-OSPool.md +++ b/_about/computation-ideal-for-OSPool.md @@ -1,99 +1,20 @@ --- -title: Computation on the OSPool +layout: blank +redirect_url: "/about/open_science_pool" --- -
- Open Science Pool Users -
-## What size of computations are ideal for the OSPool? - -> For problems that can be run as many independent jobs, as in the first two columns of the table below, the OSPool provides computing capacity that can transform the types of questions that researchers are able to tackle. Importantly, many compute tasks that may appear to not be a good fit can be modified in simple ways to take advantage, and we'd love to discuss options with you! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Ideal Jobs!Still very advantageousMaybe not, but get in touch!
Expected Throughput, per user1000s concurrent cores100s concurrent coresLet's discuss!
CPU1< 8> 8 (or MPI)
Walltime< 10 hrs*< 20 hrs*> 20 hrs
RAM< few GB< 40 GB> 40 GB
Input< 500 MB< 10 GB> 10 GB**
Output< 1 GB< 10 GB> 10 GB**
Softwarepre-compiled binaries, containersMost other than ->Licensed Software, non-Linux
- -or checkpointable *per job; you can work with a large dataset on OSG if it can be split into pieces - -## Some examples of work that has been a good fit for the OSG and benefited from using its resources include - -- image analysis (including MRI, GIS, etc.) -- text-based analysis, including DNA read mapping and other bioinformatics -- parameter sweeps -- Monte Carlo methods and other model optimization - -[Learn more and chat with a Research Computing Facilitator](https://connect.osg-htc.org/) by requesting an account. - -## Running jobs on the OSPool - -> Users submitting jobs can specify their own requirements on what machines to use. You can require the use of one particular machine, or any from a particular cluster, or any with a certain amount of memory or processor type. - -> We recommend submitting lots of jobs and taking advantage of all the idle cycles, wherever they may be. If you are doing simulation work, don't submit one simulation, submit one hundred or one thousand variations at once. We cannot guarantee that any single job will finish quickly, but it will allow you to accomplish more overall work than if you used just your own machines. - -## Where do I go if I need help or have questions? - -> We have complete knowledge base materials here and an active and supportive facilitation team. - -## What about Campuses that want to Support Researchers and dHTC locally? - -> Campuses can - -- Build ‘Local’ dHTC capacity with HTCondor, which provides service orchestration services -- Share local resources and excess capacity via OSG -- Take advantage of dHTC and dHTC Facilitation training -- Provide Local submission points into OSPools -- These Services are all Free and Open with Facilitation for Campuses - -> Most campuses prefer the hosted Compute Entry (CE) option wherein the OSG team will host and operate the HTCondor Compute Entrypoint, and configure it for the communities the campus chooses to support. - -> Other campuses choose to set up their compute entry point locally and use an OSG hosted Compute CE that provides the entry point for resource requests coming from the OSG; it handles authorization and delegation of resource requests to campus’ existing HPC/HTC cluster. + + +
+
+
+ OSG Logo +
+
+ Click Here to be Redirected to Office Hours! +
+
+
diff --git a/_about/open_science_pool.md b/_about/open_science_pool.md index fa45fb38..bbcd9b44 100644 --- a/_about/open_science_pool.md +++ b/_about/open_science_pool.md @@ -6,32 +6,115 @@ title: Open Science Pool Open Science Pool on the OSG -## What is the Open Science Pool? +# What is the Open Science Pool? -> The Open Science Pool (OSPool) is a virtual cluster operated by the OSG, with shared computing and data resources using distributed high-throughput computing (dHTC). The pool aggregates computing resources contributed by clusters across and beyond the US, making them usable by the US-based open science community, from individual researchers and research groups at campuses, to multi-institutional collaborations with a US constituency. +The Open Science Pool (OSPool) is a virtual cluster operated by the OSG, +with shared computing and data resources via distributed high-throughput +computing (dHTC) technologies. The pool aggregates mostly opportunistic +(“backfill”) computing resources from contributing clusters at campuses +and other organizations, making them available to the US-based open science +community. -Researchers can submit computational work to the OSPool via access points operated locally to their campuses, or via access points operated as part of the [OSG Connect](https://connect.osg-htc.org/) service, which serves researchers affiliated with projects at US-based academic, non-profit, and government institutions. +Researchers can submit computational work to the OSPool via access points +operated locally to their campuses, or via access points operated as part +of the [OSG Connect](https://connect.osg-htc.org/) service, which serves researchers affiliated with +projects at US-based academic, non-profit, and government institutions. +Sign up for an account on [OSG Connect](https://connect.osg-htc.org/), today! ## Who can use the OSPool? -> Access is free and open to +**Access is free and open to** +- any researcher affiliated with a project at a US-based academic, government, or non-profit institution (via the OSG Connect service). +- any researcher affiliated with such an institution or project with its own access point. +- all areas of research including social sciences, humanities, life sciences, engineering, medicine, chemistry and physics. ->- any researcher affiliated with a project at a US-based academic, government, or non-profit institution (via the OSG Connect service). ->- any researcher affiliated with an organization that has its own access point (not limited to US affiliation). ->- all areas of research including social sciences, humanities, life sciences, engineering, medicine, chemistry and physics. +[View projects](https://gracc.opensciencegrid.org/d/000000037/payload-jobs-summary?orgId=1&var-ReportableVOName=osg&var-Project=All&var-Facility=All&var-User=All&var-ExitCode=All&var-Probe=All&var-interval=1d) + using the OSPool in OSG’s Accounting System (GRACC). ## What types of work run well on the OSPool? -> Work that can be executed as independent laptop-sized computations and individually complete in less than 20 hours run well in the OSPool. A wide range of research problems and computational methods can be broken up or otherwise executed this way, including: +For problems that can be run as numerous, self-contained jobs, the OSPool provides computing capacity that can transform the types of questions researchers are able to tackle (see the table below). A wide range of research problems and computational methods can be broken up or otherwise executed in this high-throughput computing (HTC ) approach, including: - image analysis (including MRI, GIS, etc.) - text-based analysis, including DNA read mapping and other bioinformatics - parameter sweeps - model optimization approaches, including Monte Carlo methods -- Machine learning and AI executed with multiple independent training tasks, different parameters, and/or data subsets +- machine learning and AI executed with multiple independent training tasks, different parameters, and/or data subsets ->Learn more and chat with a Research Computing Facilitator by [requesting an account](https://connect.osg-htc.org/). +The OSPool is made up of mostly opportunistic capacity - contributing clusters may interrupt jobs at any time. Thus, the OSPool supports workloads of numerous jobs that individually complete or checkpoint within 20 hours. + +__Importantly, many compute tasks can take advantage of the OSPool with simple modifications, and we’d love to discuss options with you!__ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Ideal Jobs!Still very advantageousMaybe not, but get in touch!
Expected Throughput, per user1000s concurrent cores100s concurrent coresLet's discuss!
CPU1 per job< 8 per job> 8 per job
Walltime< 10 hrs*< 20 hrs*> 20 hrs
RAM< few GB< 40 GB> 40 GB
Input< 500 MB< 10 GB> 10 GB**
Output< 1 GB< 10 GB> 10 GB**
Softwarepre-compiled binaries, containersMost other than →Licensed Software, non-Linux
+ +*or checkpointable + +** per job; you can work with a large dataset on OSG if it can be split into pieces + + +Learn more and chat with a Research Computing Facilitator by [requesting an account](https://connect.osg-htc.org/). + +## Learning to use the OSPool + +We have a complete [knowledge base of user documentation](https://support.opensciencegrid.org/support/home) +and an active and supportive [facilitation team](https://support.opensciencegrid.org/support/solutions/articles/12000084585), +who support all users on [OSG Connect](https://connect.osg-htc.org/) access points. + +Users submitting jobs can specify their own requirements for per-job compute resources (e.g. CPU cores, memory, etc.) and any special server requirements. We recommend submitting lots of jobs and taking advantage of all the idle cycles, wherever they may be. We cannot guarantee that any single job will finish quickly, but the OSPool will allow you to accomplish a tremendous amount of work across jobs. ## Who contributes capacity to the OSPool? -> The computing resources for the OSPool are contributed by members of the OSG Compute Federation, typically campuses, government supported supercomputing centers or research collaborations. The members individually determine their policies for contributing resources, including the amount of resources it contributes and when these resources are available. In addition, some resource providers decide to share their resources with a specific research project, or they may choose to contribute resources to all in the OSPool. +The computing resources for the OSPool are contributed by members of the OSG Compute Federation, typically campuses, government-supported supercomputing centers, and research collaborations. The members individually determine their policies for contributing resources, including the amount of resources it contributes and when these resources are available. In addition, some resource providers decide to share their resources with specific research projects, or they may choose to contribute resources to all in the OSPool. + +[View facility contributions](https://gracc.opensciencegrid.org/d/000000043/pilot-jobs-summary?orgId=1&var-VOName=osg&var-Facility=All&var-ExitCode=All&var-Probe=All&var-interval=1d) to the OSPool in OSG’s Accounting System (GRACC). diff --git a/_config.yml b/_config.yml index 1fc88d30..a4fd1d10 100644 --- a/_config.yml +++ b/_config.yml @@ -10,6 +10,10 @@ include: - .well-known - .nojekyll + +exclude: + - _spotlights/images + defaults: - scope: path: "" diff --git a/_data/about.yml b/_data/about.yml index 50adb859..3cff1b23 100644 --- a/_data/about.yml +++ b/_data/about.yml @@ -2,7 +2,6 @@ docs: - introduction - open_science_pool - - computation-ideal-for-OSPool - osdf - organization - team diff --git a/_data/people/patrick-lubben.yml b/_data/people/patrick-lubben.yml new file mode 100644 index 00000000..53c970bb --- /dev/null +++ b/_data/people/patrick-lubben.yml @@ -0,0 +1,4 @@ +name: Patrick Lubben +image: "/assets/images/team/patrick_lubben.jpeg" +title: Assistant System Administrator +institution: "University of Wisconsin-Madison" \ No newline at end of file diff --git a/_data/people/taylor-halvensleben.yml b/_data/people/taylor-halvensleben.yml new file mode 100644 index 00000000..e59bed27 --- /dev/null +++ b/_data/people/taylor-halvensleben.yml @@ -0,0 +1,4 @@ +name: Taylor Halvensleben +image: "/assets/images/team/taylor_halvensleben.png" +title: Office and Communications Assistant +institution: "Morgridge Institute for Research" \ No newline at end of file diff --git a/_events/2022-All-Hands-Meeting.html b/_events/2022-All-Hands-Meeting.html new file mode 100644 index 00000000..d9a08306 --- /dev/null +++ b/_events/2022-All-Hands-Meeting.html @@ -0,0 +1,179 @@ +--- +short_title: OSG All-Hands Meeting 2022 +title: "OSG All-Hands Meeting 2022" +published: true +excerpt: | + OSG All-Hands Meeting 2022 to be held March 14-18 virtually. +start_date: 2022-03-14 +end_date: 2022-03-18 +location: "Virtually" +link: "https://opensciencegrid.org/all-hands/2022/" +image: "/assets/images/events/All_Hands_Banner.png" +header_image: "/assets/images/events/All_Hands_Banner.png" +layout: table-of-contents +table_of_contents: + - name: State of OSG + href: "#state-of-osg" + children: + - name: PATh Forward Remarks + href: "#ml-path-forward-remarks" + - name: The State of OSG + href: "#fw-state-of-osg" + - name: Introducing the PATh Facility + href: "#bb-introducing-the-path-facility" + - name: Democratizing Access to Cyberinfrastructure + href: "#democratizing-access-to-cyberinfrastructure" + children: + - name: Democratizing Access to Cyberinfrastructure + href: "#kt-democratizing-access-to-cyberinfrastructure" + - name: Campus Services and Perspectives + href: "#campus-services-and-perspectives" + children: + - name: Expanding OSG Services for Campuses + href: "#fw-and-lm-expanding-osg-services-for-campuses" + - name: High-Performance Computing in the Texas Panhandle and beyond + href: "#ap-hpc-in-the-texas-panhandle-and-beyond" + - name: Using, and not using, OSG + href: "#bf-using-and-not-using-osg" + - name: Advancing the Process of Science and Innovation at ASU with OSG + href: "#dj-advancing-the-process-of-science-and-innovation-at-asu-with-osg" + - name: Integrating a Diversity of Capacity Resources into dHTC Pools + href: "#integrating-a-diversity-of-capacity-resources-into-dhtc-pools" + children: + - name: Managing HTC workloads via an Access Point + href: "#ml-managing-htc-workloads-via-an-ap" + - name: Contributions + href: "#contributions" +--- + +
+ +
+
+

+ This years All-Hands event hosted 38 talks from researchers, collaborators and OSG executives on their contributions + towards bringing OSG into 2022. +

+
+
+ +

Presentation Recordings

+{% assign now = "now" | date: "%s" %} +{% if now < "1650652532" %} +

+ This list is incomplete and will be added to as we edit and process the events talks. +

+{% endif %} +
+ +

State of OSG

+ +

+ + Miron Livny – PATh Forward Remarks + +

+

+ Miron Livny welcomes participants and speakers to this year's virtual OSG All Hands Meeting event and provides + a quick outline of the PATh project and its impacts in recent years. +

+

+ + Frank Wuerthwein – The State of the OSG + +

+

+ In this presentation, Frank Wuerthwein discusses the goals of the OSG Consortium to further the advancement of + all open science. Wuerthwein further defines the OSG vision to create access to an open cyberinfrastructure for + all and push forward democratized access across the nation. There is a brief overview of concepts such as compute + research pools, the OSG Data Federation, data origins, and global namespaces. Additionally, there’s an in-depth + discussion about the Open Science Pool community. +

+

+ + Brian Bockelman – Introducing the PATh Facility + +

+

+ In this overview of PATh facilities, Brian Bockelman describes technologies, services, and resources. + Access points are defined, such as OSG Connect, and they serve as a portal to different research pools. + Bockelman discusses the Open Science Pool (OSPool) and breaks down the dividing process of opportunistic + or donated resources within the OSPool. Additionally, there is a clarification on credit accounts and a + snapshot of plans with the PATh facility. +

+ +

Democratizing Access to Cyberinfrastructure

+

+ + Kevin Thompson – Democratizing Access to Cyberinfrastructure + +

+

+ Kevin Thompson breaks down the National Science Foundation’s (NSF) priorities and provides + a general foundation overview. It also reveals several outside organizations that will assist with + implementing NSF visions to improve community access to cyberinfrastructure. NSF has goals to + support various allocations and explore and develop models for increased support to democratize access. +

+ +

Campus Services and Perspectives

+

+ + Frank Wuerthwein, Lauren Michael – Expanding OSG Services for Campuses + +

+

+ Overview of OSG services such as compute resource pools, access points, and + compute entry points. Frank and Lauren discuss the process of receiving access to these services, how they work, + and regular user training sessions. The functionality of OSG services is practical and flexible for + individual and campus needs. +

+

+ + Anirban Pal – High-Performance Computing in the Texas Panhandle and beyond + +

+

+ West Texas A&M University has a strong need for HPC for research and educational needs. + This institution is a considerably rural Hispanic-Serving Institution (HSI) with data-intensive + science drivers that would benefit from high-performance computation. The institution received a + CC* award to install a computer data center on campus and has connected with OSG services as a first + step to closing the knowledge gap. +

+

+ + Bennet Fauber – Using, and not using, OSG + +

+

+ Bennet Fauber highlights the different University of Michigan programs that utilize OSG services, + including psychology, engineering, and environmental science. There were challenges for each project + –– however, newly trained students could use OSG to process portions of the large amounts of data. +

+

+ + Douglas Jennewein – Advancing the Process of Science and Innovation at ASU with OSG + +

+

+ Arizona State University’s research computing department examines intensive data amounts + through many projects, and OSG services and training have assisted with those projects. + ASU is currently project-focused on innovation in the computing sector and improving + functionality and accessibility for its campus and all institutions. +

+ + +

Integrating a Diversity of Capacity Resources into dHTC Pools

+

+ + Miron Livny – Managing HTC workloads via an Access Point + +

+

+ OSG executive, Miron Livny, provides a quick refresher of computing capacities and PATh access points, + which researchers can effectively harness through HTC to assist with their projects. +

+ +

Contributions

+

+ A list of all presentations and their included materials can be found on the event page. +

\ No newline at end of file diff --git a/_events/2022-All-Hands-Meeting.md b/_events/2022-All-Hands-Meeting.md deleted file mode 100644 index 3008d7e8..00000000 --- a/_events/2022-All-Hands-Meeting.md +++ /dev/null @@ -1,69 +0,0 @@ ---- -short_title: OSG All-Hands Meeting 2022 -title: "OSG All-Hands Meeting 2022" -published: true -excerpt: | - Registration is now open for the OSG All-Hands Meeting 2022 to be held March 14-18 virtually. -start_date: 2022-03-14 -end_date: 2022-03-18 -location: "Virtually" -link: "https://opensciencegrid.org/all-hands/2022/" -image: "/assets/images/events/OU_AHM_2022.jpeg" -header_image: "/assets/images/events/OU_AHM_2022.jpeg" -header_credit: '"Field House w/ Water Tower" by Majdan is licensed under CC BY-NC-SA 2.0. To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/2.0/?ref=openverse&atype=rich' ---- - -{% capture main %} - -Registration is now open for the OSG All-Hands Meeting 2022, which will be held 14–18 March 2022. Complete registration details are [on the AHM website](https://opensciencegrid.org/all-hands/2022/registration/). The event will be entirely virtual this year. - -Focus areas for 2022 will include: -- State of OSG and vision for its future -- New types of resources that support new types of applications -- Research that benefitted from OSG -- Campus services and experiences, and NSF Campus Cyberinfrastructure (CC*) -- Impact on multi-institutional collaborations, including U.S. LHC Projects - -Online participation will continue to be free, but registration is required. To register, visit the [AHM registration page](https://opensciencegrid.org/all-hands/2022/registration/). - -For questions, please see the contacts on the page linked above or, as always, write to . - -{% endcapture %} - -{% capture subsection %} -### Dates - -14-18 March 2022 - - -### Who - -Researchers, Campuses and Organizations, Site Administrators, and Collaborations interested in OSG, science and high-throughput computing. - - -### Where - -Virtual - - -### Fees - -Online participation will continue to be free. - - -### Registration - -Registration is required. Visit [the AHM website](https://opensciencegrid.org/all-hands/2022/) for complete event and registration information. - -### Questions? - -For questions, write to . -{% endcapture %} - -{% capture endblock %} - - - -{% endcapture %} - -{% include event/event-page.html %} diff --git a/_events/OSG-User-School-2022.md b/_events/OSG-User-School-2022.md index 4c4a3965..3ed27c7f 100644 --- a/_events/OSG-User-School-2022.md +++ b/_events/OSG-User-School-2022.md @@ -5,7 +5,7 @@ layout: events published: true excerpt: | - The OSG User School 2022 will be held from Monday, July 25 to Friday, July 29 in person at the University of Wisconsin-Madison campus. Registration is now open! + The OSG User School 2022 will be held from Monday, July 25 to Friday, July 29 in person at the University of Wisconsin-Madison campus. start_date: 2022-07-25 end_date: 2022-07-29 @@ -18,23 +18,15 @@ banner_src: "/assets/images/events/Madison_Skyline.jpeg" {% capture main %} -

Applications for the OSG User School 2022 are now open!

-Applications are now **open** for the OSG User School 2022! The School will occur on July 25–29, where you will learn to use high-throughput computing (HTC) systems to run large-scale computing applications at your campus or using the national-scale OSG. + +The OSG User School 2022 will occur on July 25–29, where you will learn to use high-throughput computing (HTC) systems to run large-scale computing applications at your campus or using the national-scale OSG. At the School, you will learn how HTC systems work, how to run and manage many jobs, and where to find more information and help through lectures, discussions, and hands-on activities with OSG staff. The School is ideal for graduate students in any research area where large-scale computing is an essential part of their research process, plus we welcome applications from advanced undergraduates (especially those who are involved in graduate-level research or coursework), post-doctoral students, faculty, and staff (especially those who perform research or support/facilitate researchers). -The deadline for applications is **Monday, 18 April 2022.** - -To apply, complete both of the steps below: - -Complete the [online application form](https://uwmadison.co1.qualtrics.com/jfe/form/SV_bdBbGikmcgabwGO) - -Have someone email a letter of recommendation for you to [user-school@opensciencegrid.org](user-school@opensciencegrid.org) (ask someone who knows you professionally, and have them identify your name and the “OSG User School 2022” in the subject line and letter.) - -People accepted to this program will receive financial support for essential travel and local costs associated with the School. +The deadline for applications has **passed**. {% endcapture %} @@ -55,7 +47,7 @@ The University of Wisconsin-Madison. ### Application and Deadlines Details about the application process can be found on the [OSG User School 2022 site](https://opensciencegrid.org/user-school-2022/#applications). -**Note:** The application deadline is **Monday, 18 April 2022.** +**Note:** The application deadline has **passed.** ### Contact Us diff --git a/_includes/cards/spotlight-card.html b/_includes/cards/spotlight-card.html index a77fb437..c001fc65 100644 --- a/_includes/cards/spotlight-card.html +++ b/_includes/cards/spotlight-card.html @@ -1,7 +1,7 @@ {% if include.article %} {% assign article = include.article %} {% endif %} - +
{% if article.card_src or include.card_src %} article @@ -16,7 +16,7 @@

{{ article.title }}

{% if include.content | markdownify | strip_html %} - {{ article.content }} + {{ include.content }} {% else %} {{ article.excerpt | markdownify | strip_html }} {% endif %} diff --git a/_includes/get/news.liquid b/_includes/get/news.liquid index d3b55429..3c44f313 100644 --- a/_includes/get/news.liquid +++ b/_includes/get/news.liquid @@ -1,4 +1,6 @@ {% comment %} Use this to filter out the redirects {% endcomment %} -{% assign news = site.news | where_exp: "news", "news.layout != 'blank'" | sort: "date" | reverse %} \ No newline at end of file +{% include get/news_articles.liquid %} + +{% assign news = news_articles | where_exp: "news", "news.layout != 'blank'" | sort: "date" | reverse %} \ No newline at end of file diff --git a/_includes/get/news_articles.liquid b/_includes/get/news_articles.liquid new file mode 100644 index 00000000..143c32cd --- /dev/null +++ b/_includes/get/news_articles.liquid @@ -0,0 +1,8 @@ +{% assign now = "now" | date: "%s" %} +{% assign news_articles = "" | split : "" %} +{% for story in site.news %} + {% if story.remove_on > now or story.remove_on == nil %} + {% assign news_articles = news_articles | push: story %} + {% endif %} +{% endfor %} +{% assign news_articles = news_articles | sort: "date" | reverse %} \ No newline at end of file diff --git a/_includes/layout/header.html b/_includes/layout/header.html index a4bfdafd..e954414f 100644 --- a/_includes/layout/header.html +++ b/_includes/layout/header.html @@ -1,5 +1,5 @@
-
{% include /get/future_events.html %}