NatLabRockies · jgu2 · Dec 6, 2024 · Dec 6, 2024 · Dec 9, 2024 · Dec 9, 2024
diff --git a/.gitignore b/.gitignore
@@ -168,4 +168,7 @@ data/timeseries/*
 !data/timeseries/50fa074e-9279-4b3f-bead-7762fe1643f3.csv
 !data/timeseries/141a6e6c-e47f-4363-85ed-8d40b525ac77.csv
 !data/timeseries/f97df022-1dc7-4f59-bb15-3e0d94f4ba9d.csv
-!data/timeseries/dac8030c-c9b5-48db-8550-cc78312ddabb.csv
+!data/timeseries/dac8030c-c9b5-48db-8550-cc78312ddabb.csv
+calliope_app/scripts/fixtures/parameters.xlsx
+calliope_app/scripts/fixtures/template_loc_tech_params.xlsx
+calliope_app/scripts/fixtures/template_tech_params.xlsx
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# NREL Engage: A [Calliope](https://github.com/calliope-project/calliope) Web Environment for Collaborative Energy Systems Modeling and Planning
+# NLR Engage: A [Calliope](https://github.com/calliope-project/calliope) Web Environment for Collaborative Energy Systems Modeling and Planning
 
-Engage is a free, open-access energy system planning tool that allows multiple users/stakeholders to develop and collaborate on capacity expansion models. The tool, developed at the National Renewable Energy Laboratory (NREL), provides a collaborative and easy-to-use interface built on Calliope, a multi-scale energy systems modeling framework.
+Engage is a free, open-access energy system planning tool that allows multiple users/stakeholders to develop and collaborate on capacity expansion models. The tool, developed at the National Laboratory of the Rockies (NLR), provides a collaborative and easy-to-use interface built on Calliope, a multi-scale energy systems modeling framework.
 
-- Visit the NREL hosted webtool at https://engage.nrel.gov/
+- Visit the NLR hosted webtool at https://engage.nrel.gov/
 
 
 ## Requirements

diff --git a/calliope_app/api/calliope_utils.py b/calliope_app/api/calliope_utils.py
diff --git a/calliope_app/api/models/engage.py b/calliope_app/api/models/engage.py
@@ -84,7 +84,7 @@ def register(http_host, email, password, first_name, last_name, organization):
         message = render_to_string("registration/user_activation.txt", context)
         try:
             send_mail(
-                subject="NREL ENGAGE Registration",
+                subject="NLR ENGAGE Registration",
                 message=message,
                 from_email=settings.AWS_SES_FROM_EMAIL,
                 recipient_list=[email]

diff --git a/calliope_app/api/tasks.py b/calliope_app/api/tasks.py
@@ -469,7 +469,8 @@ def on_failure(self, exc, task_id, args, kwargs, einfo):
 
         timeout_message = "Run Timeout! TimeLimit=%s seconds." % self.time_limit
         exc = timeout_message if str(exc) == "SoftTimeLimitExceeded()" else exc
-        logger.error("{!r}".format(str(exc)))
+        logger.exception(exc)
+        #logger.error("{!r}".format(str(exc)))
 
         # Add pretty error to the log
         for key in self.clean_msg_dict:

diff --git a/calliope_app/api/views/outputs.py b/calliope_app/api/views/outputs.py
@@ -443,7 +443,7 @@ def delete_run(request):
 @csrf_protect
 def publish_run(request):
     """
-    Publish a scenario run to Cambium (https://cambium.nrel.gov/)
+    Publish a scenario run to the Scenario Viewer (https://scenarioviewer.nrel.gov/)
 
     Parameters:
     model_uuid (uuid): required

diff --git a/calliope_app/calliope-files/backend/run.py b/calliope_app/calliope-files/backend/run.py
@@ -152,10 +152,10 @@ def run_plan(
 
             # NOTE: pyomo==6.7.0 opt does not have name attribute
             # Disable this for use 'appsi_highs' solver, which does not have 'persistent' in name.
-            # if "persistent" in opt.name and persistent is True:
-            #     results.attrs["objective_function_value"] = opt.get_model_attr("ObjVal")
-            # else:
-            results.attrs["objective_function_value"] = backend_model.obj()
+            if "appsi_highs" not in solver and  "persistent" in opt.name and persistent is True:
+                results.attrs["objective_function_value"] = opt.get_model_attr("ObjVal")
+            else:
+                results.attrs["objective_function_value"] = backend_model.obj()
         else:
             results = xr.Dataset(attrs={"termination_condition": termination})
 

diff --git a/calliope_app/calliope_app/settings/base.py b/calliope_app/calliope_app/settings/base.py
@@ -148,7 +148,7 @@
     os.path.join(ROOT_DIR, 'locale'),
 )
 
-## NREL API Key
+## NLR API Key
 NREL_API_EMAIL = env.str("NREL_API_EMAIL", "")
 NREL_API_KEY = env.str("NREL_API_KEY", "")
 

diff --git a/calliope_app/calliope_app/urls.py b/calliope_app/calliope_app/urls.py
@@ -20,7 +20,7 @@
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 
-admin.site.site_header = 'NREL\'s Calliope Admin'
+admin.site.site_header = 'NLR\'s Calliope Admin'
 
 urlpatterns = [
     path('i18n/', include('django.conf.urls.i18n')),

diff --git a/calliope_app/client/static/images/nlr.webp b/calliope_app/client/static/images/nlr.webp
diff --git a/calliope_app/client/static/js/scenarios.js b/calliope_app/client/static/js/scenarios.js
@@ -786,11 +786,11 @@ function activate_scenario_settings() {
 	});
 
     $('#settings_weights_import_data').on('click', function() {
-        dialogObj["monetary"] = $("#monetary").val();
-        dialogObj["co2"] = $("#co2").val();
-        dialogObj["ch4"] = $("#ch4").val();
-        dialogObj["n2o"] = $("#n2o").val();
-        dialogObj["co2e"] = $("#co2e").val();
+        dialogObj["monetary"] = !isNaN(parseFloat($("#monetary").val())) ? parseFloat($("#monetary").val()) : $("#monetary").val();
+        dialogObj["co2"] = !isNaN(parseFloat($("#co2").val())) ? parseFloat($("#co2").val()) : $("#co2").val();
+        dialogObj["ch4"] = !isNaN(parseFloat($("#ch4").val())) ? parseFloat($("#ch4").val()) : $("#ch4").val();
+        dialogObj["n2o"] = !isNaN(parseFloat($("#n2o").val())) ? parseFloat($("#n2o").val()) : $("#n2o").val();
+        dialogObj["co2e"] = !isNaN(parseFloat($("#co2e").val())) ? parseFloat($("#co2e").val()) : $("#co2e").val();        
 
         $('textarea[name="edit' + dialogInputId + '"]').text(JSON.stringify(dialogObj, undefined, 2));
         $('#scenario_weights_json_form').hide();

diff --git a/calliope_app/client/templates/add_run.html b/calliope_app/client/templates/add_run.html
@@ -89,7 +89,7 @@ <h5>{% trans "Run Options" %}:</h5>
 
 			<h6 style="margin-top: 20px">
 				{% trans "Enable Clustered Run:" %}
-				<input id="cluster" class="centered" type="checkbox" checked="checked">
+				<input id="cluster" class="centered" type="checkbox">
 			</h6>
 
 			<h6 style="margin-top: 20px">

diff --git a/calliope_app/client/templates/base.html b/calliope_app/client/templates/base.html
@@ -119,7 +119,7 @@
 				{% endif %}
 
 				<a href="https://www.nrel.gov/" target="_blank">
-					<div style="float:right">&nbsp;&nbsp;&nbsp;<img src="{% static 'images/nrel_logo_full.jpg' %}" height="36px" />&nbsp;&nbsp;&nbsp;</div>
+					<div style="float:right">&nbsp;&nbsp;&nbsp;<img src="{% static 'images/nlr.webp' %}" height="36px" />&nbsp;&nbsp;&nbsp;</div>
 				</a>
 
 				<!-- Timezone -->
@@ -238,7 +238,7 @@ <h5 class="modal-title" id="helpModalTitle">{% trans "Help Guide" %}</h5>
 
 	      	<!-- Assistance -->
 	      	<b>{% trans "Project Assistance" %}:</b>&nbsp;
-			<a href = "mailto: Tom.Harris@nrel.gov"><i class="fas fa-envelope"></i> Tom Harris</a>
+			<a href = "mailto: james.morris@nrel.gov"><i class="fas fa-envelope"></i> James Morris</a>
 	      	<hr>
 
 	      	<!-- Calliope Documentation -->

diff --git a/calliope_app/client/templates/locations.html b/calliope_app/client/templates/locations.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block head %}
-<title>NREL Engage | {{ model.name }} | Locations</title>
+<title>NLR Engage | {{ model.name }} | Locations</title>
 <script type="text/javascript" src="{% static 'js/locations.js' %}"></script>
 <style>
     html, body {

diff --git a/calliope_app/client/templates/notifications/notify_user_on_run_failure.txt b/calliope_app/client/templates/notifications/notify_user_on_run_failure.txt
@@ -10,4 +10,4 @@ ERROR: {{ error_message }}.
 https://engage.nrel.gov/{{ model_uuid }}/runs/
 
 Sincerely,
-The NREL Engage Team
+The NLR Engage Team
diff --git a/calliope_app/client/templates/notifications/notify_user_on_run_success.txt b/calliope_app/client/templates/notifications/notify_user_on_run_success.txt
@@ -8,4 +8,4 @@ Your model, "{{ model_name }}", has run SUCCESSFULLY. Please check the results i
 https://engage.nrel.gov/{{ model_uuid }}/runs/
 
 Sincerely,
-The NREL Engage Team
+The NLR Engage Team
diff --git a/calliope_app/client/templates/registration/login.html b/calliope_app/client/templates/registration/login.html
@@ -29,7 +29,7 @@
 				{% trans "Need assistance with this tool?" %}
 				<br>
 				<b>{% trans "Project Assistance" %}:</b>&nbsp;
-				<a href="mailto: Tom.Harris@nrel.gov"><i class="fas fa-envelope"></i> Tom Harris</a>
+				<a href="mailto: James.Morris@nrel.gov"><i class="fas fa-envelope"></i> James Morris</a>
 				<br><br>
 			</div>
 			<div class="col-12">

diff --git a/calliope_app/client/templates/registration/pw_reset_email.html b/calliope_app/client/templates/registration/pw_reset_email.html
@@ -9,5 +9,5 @@
 {% trans "If clicking the link above doesn't work, please copy and paste the URL in a new browser window instead." %}
 
 {% trans "Sincerely" %},
-{% trans "The NREL Engage Team" %}
+{% trans "The NLR Engage Team" %}
 {% endautoescape %}
diff --git a/calliope_app/client/templates/registration/pw_reset_subject.txt b/calliope_app/client/templates/registration/pw_reset_subject.txt
@@ -1 +1 @@
-NREL ENGAGE Password Reset
+NLR ENGAGE Password Reset
diff --git a/calliope_app/client/templates/registration/user_activation.txt b/calliope_app/client/templates/registration/user_activation.txt
@@ -11,4 +11,4 @@ If clicking the link above doesn't work, please copy and paste the URL in a new
 window instead.
 
 Sincerely,
-The NREL Engage Team
+The NLR Engage Team
diff --git a/calliope_app/compose/Dockerfile b/calliope_app/compose/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update -y --fix-missing \
 # install python packages
 WORKDIR /www
 COPY requirements.txt requirements-dev.txt /www/
-RUN pip install --upgrade pip
-RUN pip install -r requirements.txt && pip install -r requirements-dev.txt
+RUN pip install --upgrade pip && pip install -r requirements.txt && pip install -r requirements-dev.txt
+RUN pip install "git+https://github.com/NREL/[email protected]"
 # Install calliope without dependencies, as already installed in requirements
 RUN pip install calliope==0.6.8 --no-deps
 

diff --git a/calliope_app/locale/en/LC_MESSAGES/django.po b/calliope_app/locale/en/LC_MESSAGES/django.po
@@ -573,7 +573,7 @@ msgid "Sincerely"
 msgstr ""
 
 #: client/templates/registration/pw_reset_email.html:12
-msgid "The NREL Engage Team"
+msgid "The NLR Engage Team"
 msgstr ""
 
 #: client/templates/registration/pw_reset_form.html:13

diff --git a/calliope_app/locale/es/LC_MESSAGES/django.po b/calliope_app/locale/es/LC_MESSAGES/django.po
@@ -942,8 +942,8 @@ msgid "Sincerely"
 msgstr "Atentamente"
 
 #: client/templates/registration/pw_reset_email.html:12
-msgid "The NREL Engage Team"
-msgstr "El equipo Engage de NREL"
+msgid "The NLR Engage Team"
+msgstr "El equipo Engage de NLR"
 
 #: client/templates/registration/pw_reset_form.html:13
 msgid ""

diff --git a/calliope_app/locale/fr/LC_MESSAGES/django.po b/calliope_app/locale/fr/LC_MESSAGES/django.po
@@ -952,8 +952,8 @@ msgid "Sincerely"
 msgstr "Cordialement, "
 
 #: client/templates/registration/pw_reset_email.html:12
-msgid "The NREL Engage Team"
-msgstr "L'équipe Engage de NREL"
+msgid "The NLR Engage Team"
+msgstr "L'équipe Engage de NLR"
 
 #: client/templates/registration/pw_reset_form.html:13
 msgid ""

diff --git a/calliope_app/requirements.txt b/calliope_app/requirements.txt
@@ -1,13 +1,13 @@
 django_ratelimit==4.1.0
-git+https://github.com/NREL/GEOPHIRES-X.git#egg=geophires-x
+coolprop<=6.7.0
 boto3==1.24.37
 celery[redis]==5.3.0
-django==4.2.16
+django==4.2.27
 django-crispy-forms==1.14.0
 django-environ>=0.4.5
 django-modeltranslation==0.18.12
 flower>=2.0.1
-nrel-pysam==2.1.5.dev3
+nrel-pysam==3.0.2
 pint==0.21
 psycopg2-binary==2.9.3
 pyyaml==6.0

diff --git a/calliope_app/setup.py b/calliope_app/setup.py
@@ -10,7 +10,7 @@
 test_requirements = []
 
 setup(
-    author="NREL",
+    author="NLR",
     author_email='[email protected]',
     python_requires='>=3.8',
     classifiers=[

diff --git a/calliope_app/version.py b/calliope_app/version.py
@@ -1 +1 @@
-__version__ = "1.1.4"
+__version__ = "1.1.5"
diff --git a/docs/_sources/contributing-to-engage.rst.txt b/docs/_sources/contributing-to-engage.rst.txt
@@ -12,7 +12,7 @@ make a valiation, response, close and/or assign it to a milestone.
 
 Pull Requests
 -------------
-We are welcome to any contribution from outside of NREL, the contributions can make this web tool better.
+We are welcome to any contribution from outside of NLR, the contributions can make this web tool better.
 Please follow the following steps to contribute to this project.
 
 1. Fork this repository to your account.
@@ -21,7 +21,7 @@ Please follow the following steps to contribute to this project.
 4. Test your feature branch by using Django test framework.
 5. Update documentation if necessary.
 6. Create a pull request to our ``dev`` branch.
-7. NREL reviews, tests and merges the pull request.
+7. NLR reviews, tests and merges the pull request.
 
 .. Note::
 

diff --git a/docs/_sources/getting-started.rst.txt b/docs/_sources/getting-started.rst.txt
@@ -45,7 +45,7 @@ Create a folder ``.envs`` in the root directory of project, then within ``.envs`
     # Mapbox
     MAPBOX_TOKEN=
 
-    # NREL PVWatts & PySAM API
+    # NLR PVWatts & PySAM API
     NREL_API_EMAIL=
     NREL_API_KEY=
 
@@ -54,8 +54,8 @@ Must obtain a mapbox token for accessing the Mapbox basemap resources.To obtain
 please refer to `get-started-tokens-api <https://docs.mapbox.com/help/tutorials/get-started-tokens-api/>`_.
 
 # PVWatts is used to import PV solar capacity factor timeseries in the Locations tab of the user interface. 
-Must obtain a PVWatts token for accessing the NREL API resources. 
-To obtain a ``NREL_API_KEY``, please refer to NRREL's `api-key <https://developer.nrel.gov/docs/api-key/>`_.
+Must obtain a PVWatts token for accessing the NLR API resources. 
+To obtain a ``NREL_API_KEY``, please refer to NLR's `api-key <https://developer.nrel.gov/docs/api-key/>`_.
 
 The following environment variables about `AWS SES` are optional.
 

diff --git a/docs/_sources/index.rst.txt b/docs/_sources/index.rst.txt
@@ -10,11 +10,11 @@ A Calliope Web Environment for Collaborative Energy Systems Modeling and Plannin
 
 Engage is a free, open-access energy system planning tool that allows multiple 
 users/stakeholders to develop and collaborate on capacity expansion models. 
-The tool, developed at the National Renewable Energy Laboratory (NREL), provides 
+The tool, developed at the National Laboratory of the Rockies (NLR), provides 
 a collaborative and easy-to-use interface built on Calliope, a multi-scale energy 
 systems modeling framework.
 
-Please visit the NREL hosted webtool at https://engage.nrel.gov/.
+Please visit the NLR hosted webtool at https://engage.nrel.gov/.
 
 .. toctree::
    :maxdepth: 2
@@ -25,7 +25,7 @@ Please visit the NREL hosted webtool at https://engage.nrel.gov/.
    optimization-solvers
    language-translation
    contributing-to-engage
-   nrel-deployment
+   nlr-deployment
    release-notes
    license
 

diff --git a/docs/_sources/nrel-deployment.rst.txt b/docs/_sources/nrel-deployment.rst.txt
@@ -1,15 +1,15 @@
-NREL Deployment
+NLR Deployment
 ===============
 
-NREL provides a hosted Enage application, please visit https://engage.nrel.gov/.
+NLR provides a hosted Enage application, please visit https://engage.nrel.gov/.
 
 Any contributions to this project in repo will be reviewed, merged and finally deployed 
-into NREL host.
+into NLR host.
 
 AWS
 ---
 This Engage web application is deployed on AWS.
 
 Jenkins
 -------
-This automation of continuous delivery (CD) of this project at NREL was setup via `Jenkis <https://www.jenkins.io/>`_.
+This automation of continuous delivery (CD) of this project at NLR was setup via `Jenkis <https://www.jenkins.io/>`_.
diff --git a/docs/_sources/release-notes.rst.txt b/docs/_sources/release-notes.rst.txt
@@ -1,7 +1,7 @@
 Release Notes
 =============
 
-Engage project is released with milestones. NREL will tend to solve issues and merge PRs to a future release where necessary.
+Engage project is released with milestones. NLR will tend to solve issues and merge PRs to a future release where necessary.
 An issue being tagged under a particular release milestone should not be taken as any kind of guarantee of being shipped in immediate
 release, please observe the release notes below.
 

diff --git a/docs/contributing-to-engage.html b/docs/contributing-to-engage.html
@@ -13,7 +13,7 @@
     <script src="_static/sphinx_highlight.js?v=4825356b"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="NREL Deployment" href="nrel-deployment.html" />
+    <link rel="next" title="NLR Deployment" href="nlr-deployment.html" />
     <link rel="prev" title="Language Translation" href="language-translation.html" />
 
   <link rel="stylesheet" href="_static/custom.css" type="text/css" />
@@ -42,7 +42,7 @@ <h2>Issue Tracking<a class="headerlink" href="#issue-tracking" title="Permalink
 </section>
 <section id="pull-requests">
 <h2>Pull Requests<a class="headerlink" href="#pull-requests" title="Permalink to this heading">¶</a></h2>
-<p>We are welcome to any contribution from outside of NREL, the contributions can make this web tool better.
+<p>We are welcome to any contribution from outside of NLR, the contributions can make this web tool better.
 Please follow the following steps to contribute to this project.</p>
 <ol class="arabic simple">
 <li><p>Fork this repository to your account.</p></li>
@@ -51,7 +51,7 @@ <h2>Pull Requests<a class="headerlink" href="#pull-requests" title="Permalink to
 <li><p>Test your feature branch by using Django test framework.</p></li>
 <li><p>Update documentation if necessary.</p></li>
 <li><p>Create a pull request to our <code class="docutils literal notranslate"><span class="pre">dev</span></code> branch.</p></li>
-<li><p>NREL reviews, tests and merges the pull request.</p></li>
+<li><p>NLR reviews, tests and merges the pull request.</p></li>
 </ol>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
@@ -101,7 +101,7 @@ <h3>Navigation</h3>
 <li class="toctree-l2"><a class="reference internal" href="#update-documenttation">Update Documenttation</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="nrel-deployment.html">NREL Deployment</a></li>
+<li class="toctree-l1"><a class="reference internal" href="nlr-deployment.html">NLR Deployment</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-notes.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
@@ -111,7 +111,7 @@ <h3>Related Topics</h3>
 <ul>
   <li><a href="index.html">Documentation overview</a><ul>
       <li>Previous: <a href="language-translation.html" title="previous chapter">Language Translation</a></li>
-      <li>Next: <a href="nrel-deployment.html" title="next chapter">NREL Deployment</a></li>
+      <li>Next: <a href="nlr-deployment.html" title="next chapter">NLR Deployment</a></li>
   </ul></li>
 </ul>
 </div>

diff --git a/docs/genindex.html b/docs/genindex.html
@@ -59,7 +59,7 @@ <h3>Navigation</h3>
 <li class="toctree-l1"><a class="reference internal" href="optimization-solvers.html">Optimization Solvers</a></li>
 <li class="toctree-l1"><a class="reference internal" href="language-translation.html">Language Translation</a></li>
 <li class="toctree-l1"><a class="reference internal" href="contributing-to-engage.html">Contributing to Engage</a></li>
-<li class="toctree-l1"><a class="reference internal" href="nrel-deployment.html">NREL Deployment</a></li>
+<li class="toctree-l1"><a class="reference internal" href="nlr-deployment.html">NLR Deployment</a></li>
 <li class="toctree-l1"><a class="reference internal" href="release-notes.html">Release Notes</a></li>
 <li class="toctree-l1"><a class="reference internal" href="license.html">License</a></li>
 </ul>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		NREL ENGAGE Password Reset
		NLR ENGAGE Password Reset