diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml index 911c31d..0ccd747 100644 --- a/.github/workflows/deploy-pages.yaml +++ b/.github/workflows/deploy-pages.yaml @@ -34,13 +34,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Pages uses: actions/configure-pages@v5 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v6 with: - python-version: '3.11' + python-version: '3.13' - name: Install dependencies run: | sudo apt-get install graphviz graphviz-dev diff --git a/best_practices_report/best_practices.tex b/best_practices_report/best_practices.tex index 2c01d02..505f140 100644 --- a/best_practices_report/best_practices.tex +++ b/best_practices_report/best_practices.tex @@ -1,4 +1,4 @@ -\documentclass[]{nrel} +\documentclass[]{nlr} %%%%% Package options place in square brackets % singleAppendix -- format TOC and appendix chapters without lettering % draft -- add watermark "draft" @@ -53,7 +53,7 @@ \author{Garrett Barter} %<--------- Coauthor's name here \affil{National Renewable Energy Laboratory} %%%%% %<--------- If including authors from multiple institutions, the affiliation number each author needs to be -% \author[1]{Author one} %<--------- other NREL authors +% \author[1]{Author one} %<--------- other NLR authors % \affil[1]{National Renewable Energy Laboratory} % \author[2]{Author two} %<--------- External collaborator % \affil[2]{Another affiliation} %<--------- External collaborator affil diff --git a/best_practices_report/nrel.cls b/best_practices_report/nlr.cls similarity index 88% rename from best_practices_report/nrel.cls rename to best_practices_report/nlr.cls index 18a9bb0..79b0e0f 100644 --- a/best_practices_report/nrel.cls +++ b/best_practices_report/nlr.cls @@ -1,15 +1,15 @@ -% File: nrel.cls v2.0.2, April 2022 +% File: nlr.cls v2.0.2, April 2022 % This class file provides basic functionality for producing -% PDFs that meet NREL's style and formatting requirements. +% PDFs that meet NLR's style and formatting requirements. % ------------------------------------------------------------- % Identification Part % ------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{nrel} +\ProvidesClass{nlr} \typeout{ } -\typeout{NREL.cls -- v2.0.4, November 2022} -\typeout{Formats documents according to the NREL style guide} +\typeout{NLR.cls -- v2.0.4, November 2022} +\typeout{Formats documents according to the NLR style guide} \typeout{ } % ------------------------------------------------------------- @@ -26,10 +26,10 @@ % print links in black \newboolean{blacklinks} \setboolean{blacklinks}{false} -% Set flag to meet NREL RAAW requirements +% Set flag to meet NLR RAAW requirements % true by default -\newboolean{IsNREL} -\setboolean{IsNREL}{true} +\newboolean{IsNLR} +\setboolean{IsNLR}{true} % Set flag to meet EERE RAAW requirements \newboolean{IsEERE} \setboolean{IsEERE}{false} @@ -54,15 +54,15 @@ % If EERE option is set, format as EERE RAAW \DeclareOption{EERE}{ \setboolean{IsEERE}{true} - \setboolean{IsNREL}{false} - \def\NREL@class{report} + \setboolean{IsNLR}{false} + \def\NLR@class{report} \typeout{Using EERE report RAAW} } -% NREL is assumed to be true by default +% NLR is assumed to be true by default % unless switched off by EERE flag -\ifthenelse{\boolean{IsNREL}}{ - \def\NREL@class{report} - \typeout{Using NREL report RAAW} +\ifthenelse{\boolean{IsNLR}}{ + \def\NLR@class{report} + \typeout{Using NLR report RAAW} }{} % If tagged option is set, format as tagged pdf \DeclareOption{tagged}{ @@ -83,10 +83,10 @@ % ------------------------------------------------------------- % Process Options % ------------------------------------------------------------- -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\NREL@class}} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\NLR@class}} \ExecuteOptions{12pt} \ProcessOptions\relax -\LoadClass{\NREL@class} +\LoadClass{\NLR@class} % ------------------------------------------------------------- % Package Loading @@ -128,7 +128,7 @@ \RequirePackage[T1]{fontenc} % colours \RequirePackage{xcolor} -\definecolor{nrelblue}{RGB}{0, 121, 193} +\definecolor{nlrblue}{RGB}{0, 121, 193} % set languages \RequirePackage[english]{babel} % To stop hyphenation in titles etc @@ -176,8 +176,8 @@ % \titleformat{\chapter}{\fontsize{18pt}{0pt}\bfseries\selectfont} % \vspace*{12pt} } -% see NREL formatting guidelines at -% https://communications_resources.nrel.gov/style_guide/references +% see NLR formatting guidelines at +% https://communications_resources.nlr.gov/style_guide/references % technical reports \DeclareBibliographyAlias{techreport}{book} % make one type of publication look like another @@ -189,7 +189,7 @@ % -------------------------------------------------------- % Main Code % -------------------------------------------------------- -% NREL default is ragged right. +% NLR default is ragged right. % Load ragged2e so \justifying and environment justify are available. % Redefines \centering, \raggedleft, and \raggedright, and environments center % flushleft and flushright to use versions made by ragged2e. @@ -216,9 +216,9 @@ \renewcommand{\cfttabaftersnum}{.} % title font -\renewcommand{\cfttoctitlefont}{\color{nrelblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} -\renewcommand{\cftloftitlefont}{\color{nrelblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} -\renewcommand{\cftlottitlefont}{\color{nrelblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} +\renewcommand{\cfttoctitlefont}{\color{nlrblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} +\renewcommand{\cftloftitlefont}{\color{nlrblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} +\renewcommand{\cftlottitlefont}{\color{nlrblue} \raggedright \fontsize{18}{6}\sffamily\bfseries} \renewcommand{\cftchapfont}{ \fontsize{10pt}{10pt}\sffamily\bfseries} \renewcommand{\cftsecfont}{ \fontsize{11pt}{11pt}} \renewcommand{\cftsubsecfont}{ \fontsize{11pt}{11pt}} @@ -256,7 +256,7 @@ % Chapter Headings \renewcommand{\@makechapterhead}[1]{% \vspace*{-20\p@}% - {\color{nrelblue} \parindent \z@ \raggedright \normalfont \interlinepenalty\@M + {\color{nlrblue} \parindent \z@ \raggedright \normalfont \interlinepenalty\@M \ifnum \c@secnumdepth >\m@ne \fontfamily{phv} \fontsize{18}{6}\fontseries{b}\selectfont \thechapter \hspace*{1em}#1 @@ -268,7 +268,7 @@ }} \renewcommand{\@makeschapterhead}[1]{% \vspace*{-20\p@}% - {\color{nrelblue} \parindent \z@ \raggedright \normalfont \interlinepenalty\@M + {\color{nlrblue} \parindent \z@ \raggedright \normalfont \interlinepenalty\@M \Large\sffamily\bfseries #1 \par\nobreak % \vspace*{-12pt} @@ -280,17 +280,17 @@ \@startsection{section}{1}{\z@} {-3.25ex \@plus -1ex \@minus -.2ex} {0.25ex \@plus .2ex} - {\color{nrelblue}\fontfamily{phv}\fontsize{14}{14}\fontseries{b}\selectfont}} + {\color{nlrblue}\fontfamily{phv}\fontsize{14}{14}\fontseries{b}\selectfont}} \renewcommand{\subsection}{% \@startsection{subsection}{2}{\z@} {-3.25ex \@plus -1ex \@minus -.2ex} {0.25ex \@plus .2ex} - {\color{nrelblue}\sffamily\normalsize\bfseries\slshape}} + {\color{nlrblue}\sffamily\normalsize\bfseries\slshape}} \renewcommand{\subsubsection}{% \@startsection{subsubsection}{3}{\z@} {-3.25ex \@plus -1ex \@minus -.2ex} {0.25ex \@plus .2ex} - {\color{nrelblue}\sffamily\normalsize\itshape}} + {\color{nlrblue}\sffamily\normalsize\itshape}} \renewcommand{\paragraph}{% \@startsection{paragraph}{4}{\z@} {-3.25ex \@plus -1ex \@minus -.2ex} @@ -386,8 +386,8 @@ \ifthenelse{\boolean{IssingleAppendix}}{ % true \AtBeginEnvironment{appendices}{ - \titleformat{\chapter}{\fontfamily{phv}\fontsize{18}{0}\selectfont\bfseries}{\textcolor{nrelblue} - {Appendix}}{11pt}{\textcolor{nrelblue}} + \titleformat{\chapter}{\fontfamily{phv}\fontsize{18}{0}\selectfont\bfseries}{\textcolor{nlrblue} + {Appendix}}{11pt}{\textcolor{nlrblue}} \titlespacing*{\chapter}{0pt}{-20pt}{0pt} } %<--------- Use this if only one appendix \newcommand{\appchapter}[1]{ @@ -396,8 +396,8 @@ } {% False \AtBeginEnvironment{appendices}{ - \titleformat{\chapter}{\fontfamily{phv}\fontsize{18}{0}\selectfont\bfseries}{\textcolor{nrelblue} - {Appendix \thechapter.}}{11pt}{\textcolor{nrelblue}} + \titleformat{\chapter}{\fontfamily{phv}\fontsize{18}{0}\selectfont\bfseries}{\textcolor{nlrblue} + {Appendix \thechapter.}}{11pt}{\textcolor{nlrblue}} \titlespacing*{\chapter}{0pt}{-20pt}{-6pt} } %<--------- Use this if more than one appendix \newcommand{\appchapter}[1]{ @@ -464,9 +464,9 @@ % colorlinks, % linktoc=all, % linkcolor=black, -% citecolor=nrelblue, +% citecolor=nlrblue, % menucolor=black, -% urlcolor=nrelblue, +% urlcolor=nlrblue, % pdfborder={0 0 0}, % unicode, % pdflang={en-US} @@ -513,35 +513,35 @@ \RequirePackage{fancyhdr} % \fancyhf{} % clear all header and footer fields \ifthenelse{\boolean{IsConfidential}}{%IsConfidential==True - \fancypagestyle{nrel}{% + \fancypagestyle{nlr}{% \fancyhf{} \renewcommand{\headrulewidth}{0pt} \fancyfoot[C]{\thepage\\\vspace{1em} \textbf{The contents of the report are confidential} }} }{%IsConfidential==False - \fancypagestyle{nrel}{% + \fancypagestyle{nlr}{% \fancyhf{} \renewcommand{\headrulewidth}{0pt} - \fancyfoot[C]{\thepage\\\vspace{1em} \fontsize{10pt}{10pt}\sffamily \textcolor{lightgray}{This report is available at no cost from the National Renewable Energy Laboratory (NREL) at \href{www.nrel.gov/publications}{www.nrel.gov/publications}}} + \fancyfoot[C]{\thepage\\\vspace{1em} \fontsize{10pt}{10pt}\sffamily \textcolor{lightgray}{This report is available at no cost from the National Renewable Energy Laboratory (NLR) at \href{www.nlr.gov/publications}{www.nlr.gov/publications}}} } % \renewcommand{\headrulewidth}{0.5pt} % \renewcommand{\headrule}{\hbox to\headwidth{% - % \color{nrelblue}\leaders\hrule height \headrulewidth\hfill}} + % \color{nlrblue}\leaders\hrule height \headrulewidth\hfill}} % \renewcommand{\footrulewidth}{0.5pt} % \renewcommand{\footrule}{\hbox to\headwidth{% - % \color{nrelblue}\leaders\hrule height \headrulewidth\hfill}} -% \thispagestyle{nrel} -% \pagestyle{nrel} + % \color{nlrblue}\leaders\hrule height \headrulewidth\hfill}} +% \thispagestyle{nlr} +% \pagestyle{nlr} } -\appto\frontmatter{\pagestyle{nrel}} -\appto\mainmatter{\pagestyle{nrel}} +\appto\frontmatter{\pagestyle{nlr}} +\appto\mainmatter{\pagestyle{nlr}} \appto\backmatter{\pagestyle{empty}} -% note that the first page of a chapter uses "plain", so we need to redefine that to match the "nrel" page style. -% \let\ps@plain\ps@nrel +% note that the first page of a chapter uses "plain", so we need to redefine that to match the "nlr" page style. +% \let\ps@plain\ps@nlr @@ -569,9 +569,9 @@ colorlinks=false, linktoc=all, linkcolor=black, - citecolor=nrelblue, + citecolor=nlrblue, menucolor=black, - urlcolor=nrelblue, + urlcolor=nlrblue, pdfborder={0 0 0}, unicode, pdflang={en-US}, @@ -601,7 +601,7 @@ \makeatother -%#TODO add ifthenelse statement to change from NREL cover page to EERE cover page +%#TODO add ifthenelse statement to change from NLR cover page to EERE cover page %% THINGS WE NEED TO DO AT THE START OF THE DOCUMENT \AtBeginDocument{ \setlength{\headsep}{6em} diff --git a/docs/_config.yml b/docs/_config.yml index e9b3dbe..64286a4 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -23,7 +23,7 @@ latex: # Information about where the book exists on the web repository: - url: https://github.com/nrel/wetostack + url: https://github.com/natlabrockies/wetostack path_to_book: docs branch: main @@ -45,4 +45,4 @@ sphinx: - 'sphinx_simplepdf' config: html_context: - default_mode: light \ No newline at end of file + default_mode: light diff --git a/docs/_toc.yml b/docs/_toc.yml index 2dd796f..340c916 100644 --- a/docs/_toc.yml +++ b/docs/_toc.yml @@ -8,7 +8,7 @@ parts: - caption: The Portfolio chapters: - file: portfolio_analysis/overview - - url: https://nrel.github.io/WETOStack/_static/entry_guide/index.html + - url: https://natlabrockies.github.io/WETOStack/_static/entry_guide/index.html title: Entry Guide - file: portfolio_analysis/software_list sections: diff --git a/docs/portfolio_analysis/attributes_schema.md b/docs/portfolio_analysis/attributes_schema.md index b7e2766..3573eff 100644 --- a/docs/portfolio_analysis/attributes_schema.md +++ b/docs/portfolio_analysis/attributes_schema.md @@ -6,18 +6,18 @@ The Portfolio Coordination project is constructing a database of all WETO softwa the portfolio-wide analysis. Initially, only actively-funded software is included, but it will expand to all software under WETO. The database consists of attributes of each software project expressed in a YAML file -in the https://github.com/nrel/wetostack repository. +in the https://github.com/natlabrockies/wetostack repository. The attributes should conform to the JSON schema (YAML is a superset of JSON) described in the documentation below. -See the [FLORIS entry](https://github.com/nrel/WETOStack/blob/main/software_attributes/database/floris.yaml) +See the [FLORIS entry](https://github.com/natlabrockies/WETOStack/blob/main/software_attributes/database/floris.yaml) for an example. To add or update a project entry, submit a pull request to this repository modifying an existing project file or creating a new one. All entries should be in the -[./software_attributes/database](https://github.com/nrel/WETOStack/tree/main/software_attributes/database) +[./software_attributes/database](https://github.com/natlabrockies/WETOStack/tree/main/software_attributes/database) directory. -A [validation script](https://github.com/nrel/WETOStack/blob/main/software_attributes/validate_schema.py) +A [validation script](https://github.com/natlabrockies/WETOStack/blob/main/software_attributes/validate_schema.py) is available, and it is run automatically upon creation and update of the pull request. ````{admonition} How to read the schema docs diff --git a/docs/portfolio_analysis/mind_maps.md b/docs/portfolio_analysis/mind_maps.md index d9e43b8..31951cc 100644 --- a/docs/portfolio_analysis/mind_maps.md +++ b/docs/portfolio_analysis/mind_maps.md @@ -30,8 +30,8 @@ mindmap - OpenFAST https://github.com/openfast/openfast - Multi-physics, multi-fidelity tool for simulating the coupled dynamic response of wind turbines. - FAST.Farm https://github.com/openfast/openfast - Mid-fidelity wind farm simulator that uses OpenFAST as a turbine model. -- MoorPy https://github.com/nrel/moorpy - Quasi-static mooring model and a suite of associated functions for mooring system analysis. -- RAFT https://github.com/WISDEM/RAFT - Library for frequency-domain analysis of floating wind turbines. +- MoorPy https://github.com/natlabrockies/moorpy - Quasi-static mooring model and a suite of associated functions for mooring system analysis. +- RAFT https://github.com/nlrwindsystems/RAFT - Library for frequency-domain analysis of floating wind turbines. - OWENS https://github.com/sandialabs/OWENS.jl - Multi-physics aero-servo-elastic tool with coupling to OpenFAST hydrodynamics and mooring for the coupled dynamic response of VAWTs and crossflow turbines. ```` @@ -91,11 +91,11 @@ mindmap om(" ") ``` -- WEIS https://github.com/wisdem/weis - Wind Energy with Integrated Servo-control performs multifidelity co-design of wind turbines by combining multiple NREL-developed tools to enable design optimization of floating offshore wind turbines. -- WISDEM https://github.com/wisdem/wisdem - Set of wind turbine and plant cost and energy production models along with financial models for assessing overall wind plant cost of energy. -- WindSE https://github.com/nrel/windse - Python package that uses a FEniCS backend to perform wind farm simulations and optimization. -- Ard https://github.com/WISDEM/Ard/ - Make plant-level design choices for the whole system and its interactions to make wind energy projects more successful. -- HOPP https://github.com/NREL/HOPP - Assesses optimal designs for the deployment of utility-scale hybrid energy plants, particularly considering wind, solar and storage. +- WEIS https://github.com/nlrwindsystems/weis - Wind Energy with Integrated Servo-control performs multifidelity co-design of wind turbines by combining multiple NLR-developed tools to enable design optimization of floating offshore wind turbines. +- WISDEM https://github.com/nlrwindsystems/wisdem - Set of wind turbine and plant cost and energy production models along with financial models for assessing overall wind plant cost of energy. +- WindSE https://github.com/natlabrockies/windse - Python package that uses a FEniCS backend to perform wind farm simulations and optimization. +- Ard https://github.com/nlrwindsystems/Ard/ - Make plant-level design choices for the whole system and its interactions to make wind energy projects more successful. +- HOPP https://github.com/natlabrockies/HOPP - Assesses optimal designs for the deployment of utility-scale hybrid energy plants, particularly considering wind, solar and storage. - SONATA https://github.com/ptrbortolotti/SONATA - Toolbox for Multidisciplinary Rotor Blade Design Environment for Structural Optimization and Aeroelastic Analysis. ```` @@ -122,10 +122,10 @@ mindmap om(" ") ``` -- ROSCO https://github.com/NREL/ROSCO - Reference controller with industry-standard functionality and generic tuning -- FLORIS https://github.com/nrel/floris - Controls-focused wind farm simulation software incorporating steady-state engineering wake models into a performance-focused Python framework. -- FLASC https://github.com/nrel/flasc - Suite of analysis tools for SCADA data filtering, analysis, wind farm model validation, field experiment design, and field experiment monitoring. -- hercules https://github.com/nrel/hercules - Wind farm emulator for controls testing with LES models. +- ROSCO https://github.com/natlabrockies/ROSCO - Reference controller with industry-standard functionality and generic tuning +- FLORIS https://github.com/natlabrockies/floris - Controls-focused wind farm simulation software incorporating steady-state engineering wake models into a performance-focused Python framework. +- FLASC https://github.com/natlabrockies/flasc - Suite of analysis tools for SCADA data filtering, analysis, wind farm model validation, field experiment design, and field experiment monitoring. +- hercules https://github.com/natlabrockies/hercules - Wind farm emulator for controls testing with LES models. ```` @@ -148,7 +148,7 @@ mindmap om(" ") ``` -- DW TAP https://github.com/NREL/dw-tap-app - A simple tool for cost-effectively and accurately assessing wind resources without having to physically take direct measurements in the field. +- DW TAP https://github.com/natlabrockies/dw-tap-app - A simple tool for cost-effectively and accurately assessing wind resources without having to physically take direct measurements in the field. ```` @@ -175,10 +175,10 @@ mindmap om(" ") ``` -- LandBOSSE https://github.com/WISDEM/LandBOSSE - A systems engineering tool that estimates the balance-of-system (BOS) costs associated with installing utility scale wind plants (10, 1.5 MW turbines or larger) -- ORBIT https://github.com/WISDEM/ORBIT - A model to study the cost and times associated with Offshore Wind Balance of System (BOS) processes. -- CORAL https://github.com/NREL/CORAL - Concurrent ORBIT for shared Resource Analysis Library -- NRWAL https://github.com/NREL/NRWAL - A library of offshore wind cost equations (plus new energy technologies like marine hydro!). +- LandBOSSE https://github.com/nlrwindsystems/LandBOSSE - A systems engineering tool that estimates the balance-of-system (BOS) costs associated with installing utility scale wind plants (10, 1.5 MW turbines or larger) +- ORBIT https://github.com/nlrwindsystems/ORBIT - A model to study the cost and times associated with Offshore Wind Balance of System (BOS) processes. +- CORAL https://github.com/natlabrockies/CORAL - Concurrent ORBIT for shared Resource Analysis Library +- NRWAL https://github.com/natlabrockies/NRWAL - A library of offshore wind cost equations (plus new energy technologies like marine hydro!). ```` @@ -201,7 +201,7 @@ mindmap om(" ") ``` -- SSRS https://github.com/NREL/SSRS - A stochastic agent-based model for predicting raptor movements through an orographic updraft field estimated using the spatially varying wind conditions and ground features (altitude, slope, aspect). +- SSRS https://github.com/natlabrockies/SSRS - A stochastic agent-based model for predicting raptor movements through an orographic updraft field estimated using the spatially varying wind conditions and ground features (altitude, slope, aspect). ```` @@ -225,6 +225,6 @@ mindmap WOMBAT ``` -- WOMBAT https://github.com/WISDEM/WOMBAT - A library to simulate the operation and maintenance phase (O&M) of distributed, land-based, and offshore wind farms using a discrete event simulation framework. -- OpenOA https://github.com/nrel/openoa - A framework for working with large time-series data from wind plants, such as SCADA. +- WOMBAT https://github.com/nlrwindsystems/WOMBAT - A library to simulate the operation and maintenance phase (O&M) of distributed, land-based, and offshore wind farms using a discrete event simulation framework. +- OpenOA https://github.com/natlabrockies/openoa - A framework for working with large time-series data from wind plants, such as SCADA. ```` diff --git a/docs/portfolio_analysis/software_list.md b/docs/portfolio_analysis/software_list.md index b37dc2a..d639cb1 100644 --- a/docs/portfolio_analysis/software_list.md +++ b/docs/portfolio_analysis/software_list.md @@ -3,12 +3,12 @@ # Software Listing While this is intended to be a complete list, it is likely missing some projects. -Please [suggest an edit](https://github.com/nrel/wetostack/edit/main/docs/portfolio_analysis/software_list.md) +Please [suggest an edit](https://github.com/natlabrockies/wetostack/edit/main/docs/portfolio_analysis/software_list.md) if any information here is incorrect. Including if a software in this list requires the following: -- Entry in [software_attributes/database_list.yaml](https://github.com/NREL/WETOStack/blob/main/software_attributes/database_list.yaml) -- Entry in [docs/software_list.md](https://github.com/NREL/WETOStack/blob/main/docs/portfolio_analysis/software_list.md) -- Corresponding YAML file in [software_attributes/database](https://github.com/NREL/WETOStack/tree/main/software_attributes/database) +- Entry in [software_attributes/database_list.yaml](https://github.com/natlabrockies/WETOStack/blob/main/software_attributes/database_list.yaml) +- Entry in [docs/software_list.md](https://github.com/natlabrockies/WETOStack/blob/main/docs/portfolio_analysis/software_list.md) +- Corresponding YAML file in [software_attributes/database](https://github.com/natlabrockies/WETOStack/tree/main/software_attributes/database) All of these tools relate to some aspect of wind energy development from component design and analysis to cost modeling and supply chain analysis. @@ -46,7 +46,7 @@ Select one or a combination of categories to down-select projects.