From 9e9a8b117b169bd8e653b82bc8f034e646197f3f Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Mon, 5 Jan 2026 10:43:53 -0500 Subject: [PATCH 01/23] add size class endpoint for bess --- julia_src/http.jl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ reoptjl/models.py | 16 +++++++++++++--- reoptjl/views.py | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/julia_src/http.jl b/julia_src/http.jl index bb59014e1..1c472ac37 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -800,6 +800,51 @@ function pv_cost_defaults(req::HTTP.Request) end +function electric_storage_cost_defaults(req::HTTP.Request) + d = JSON.parse(String(req.body)) + float_vals = ["installed_cost_per_kw", "installed_cost_per_kwh", + "installed_cost_constant", "min_kw", "max_kw", + "electric_load_annual_peak", "electric_load_average"] + int_vals = ["size_class"] + string_vals = [] + bool_vals = [] + all_vals = vcat(int_vals, string_vals, float_vals, bool_vals) + # Process .json inputs and convert to correct type if needed + for k in all_vals + if !isnothing(get(d, k, nothing)) + # TODO improve this by checking if the type is not the expected type, as opposed to just not string + if k in float_vals && typeof(d[k]) == String + d[k] = parse(Float64, d[k]) + elseif k in int_vals && typeof(d[k]) == String + d[k] = parse(Int64, d[k]) + elseif k in bool_vals && typeof(d[k]) == String + d[k] = parse(Bool, d[k]) + end + end + end + + @info "Getting ElectricStorage cost defaults..." + data = Dict() + error_response = Dict() + try + data["installed_cost_per_kw"], data["installed_cost_per_kwh"], data["installed_cost_constant"], data["size_class"], data["size_kw_for_size_class"] = reoptjl.get_electric_storage_cost_params(; + (Symbol(k) => v for (k, v) in pairs(d))... + ) + catch e + @error "Something went wrong in the electric_storage_cost_defaults" exception=(e, catch_backtrace()) + error_response["error"] = sprint(showerror, e) + end + if isempty(error_response) + @info "ElectricStorage cost defaults determined." + response = data + return HTTP.Response(200, JSON.json(response)) + else + @info "An error occured in the electric_storage_cost_defaults endpoint" + return HTTP.Response(500, JSON.json(error_response)) + end +end + + function job_no_xpress(req::HTTP.Request) error_response = Dict("error" => "V1 and V2 not available without Xpress installation.") return HTTP.Response(500, JSON.json(error_response)) @@ -829,5 +874,6 @@ HTTP.register!(ROUTER, "GET", "/health", health) HTTP.register!(ROUTER, "GET", "/get_existing_chiller_default_cop", get_existing_chiller_default_cop) HTTP.register!(ROUTER, "GET", "/get_ashp_defaults", get_ashp_defaults) HTTP.register!(ROUTER, "GET", "/pv_cost_defaults", pv_cost_defaults) +HTTP.register!(ROUTER, "GET", "/electric_storage_cost_defaults", electric_storage_cost_defaults) HTTP.register!(ROUTER, "GET", "/get_load_metrics", get_load_metrics) HTTP.serve(ROUTER, "0.0.0.0", 8081, reuseaddr=true) diff --git a/reoptjl/models.py b/reoptjl/models.py index 17a9560b3..33b32cbdc 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -3668,6 +3668,16 @@ class ElectricStorageInputs(BaseModel, models.Model): primary_key=True ) + size_class = models.IntegerField( + validators=[ + MinValueValidator(1), + MaxValueValidator(5) + ], + null=True, + blank=True, + help_text="ElectricStorage size class. Must be an integer value between 1 and 3. Default is calculated per ratio of annual peak and average load of given load profile." + ) + min_kw = models.FloatField( default=0, validators=[ @@ -3758,29 +3768,29 @@ class ElectricStorageInputs(BaseModel, models.Model): help_text="Flag to set whether the battery can be charged from the grid, or just onsite generation." ) installed_cost_per_kw = models.FloatField( - default=968.0, validators=[ MinValueValidator(0), MaxValueValidator(1.0e4) ], + null=True, blank=True, help_text="Total upfront battery power capacity costs (e.g. inverter and balance of power systems)" ) installed_cost_per_kwh = models.FloatField( - default=253.0, validators=[ MinValueValidator(0), MaxValueValidator(1.0e4) ], + null=True, blank=True, help_text="Total upfront battery costs" ) installed_cost_constant = models.FloatField( - default=222115.0, validators=[ MinValueValidator(0), MaxValueValidator(1.0e9) ], + null=True, blank=True, help_text="Fixed upfront cost for battery installation, independent of size." ) diff --git a/reoptjl/views.py b/reoptjl/views.py index ca24a5ff2..cc79247df 100644 --- a/reoptjl/views.py +++ b/reoptjl/views.py @@ -575,6 +575,45 @@ def pv_cost_defaults(request): log.debug(debug_msg) return JsonResponse({"Error": "Unexpected error in pv_cost_defaults endpoint. Check log for more."}, status=500) +def electric_storage_cost_defaults(request): + + if request.method == "POST": + inputs = json.loads(request.body) + else: + inputs = { + "installed_cost_per_kw": request.GET.get("installed_cost_per_kw"), + "installed_cost_per_kwh": request.GET.get("installed_cost_per_kwh"), + "installed_cost_constant" : request.GET.get("installed_cost_constant"), + "size_class" : request.GET.get("size_class"), + "min_kw": request.GET.get("min_kw"), + "max_kw": request.GET.get("max_kw"), + "electric_load_annual_peak": request.GET.get("electric_load_annual_peak"), + "electric_load_average": request.GET.get("electric_load_average") + } + + inputs = {k: v for k, v in inputs.items() if v is not None} + + try: + julia_host = os.environ.get('JULIA_HOST', "julia") + http_jl_response = requests.get("http://" + julia_host + ":8081/pv_cost_defaults/", json=inputs) + response = JsonResponse( + http_jl_response.json() + ) + return response + + except ValueError as e: + return JsonResponse({"Error": str(e.args[0])}, status=500) + + except KeyError as e: + return JsonResponse({"Error. Missing": str(e.args[0])}, status=500) + + except Exception: + exc_type, exc_value, exc_traceback = sys.exc_info() + debug_msg = "exc_type: {}; exc_value: {}; exc_traceback: {}".format(exc_type, exc_value.args[0], + tb.format_tb(exc_traceback)) + log.debug(debug_msg) + return JsonResponse({"Error": "Unexpected error in electric_storage_cost_defaults endpoint. Check log for more."}, status=500) + def simulated_load(request): try: # Build inputs dictionary to send to http.jl /simulated_load endpoint From 7382d1e0e1f924ddf907c61466c03fa801de5d83 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Thu, 8 Jan 2026 18:41:18 -0500 Subject: [PATCH 02/23] make migrations and add right REopt branch --- julia_src/Manifest.toml | 6 ++-- ...ectricstorageinputs_size_class_and_more.py | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index b0930d9ab..0960dd10c 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -948,9 +948,11 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "00bb39c8f932a3320960f01adc139229c24e12b7" +git-tree-sha1 = "b4b50f8909ea73c613d0e265e46851687a406aad" +repo-rev = "electric_storage_size_class" +repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.56.2" +version = "0.56.3" [[deps.Random]] deps = ["SHA"] diff --git a/reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py b/reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py new file mode 100644 index 000000000..7179fd9bf --- /dev/null +++ b/reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py @@ -0,0 +1,34 @@ +# Generated by Django 4.2.26 on 2026-01-08 23:39 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0113_merge_20251209_2338'), + ] + + operations = [ + migrations.AddField( + model_name='electricstorageinputs', + name='size_class', + field=models.IntegerField(blank=True, help_text='ElectricStorage size class. Must be an integer value between 1 and 3. Default is calculated per ratio of annual peak and average load of given load profile.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]), + ), + migrations.AlterField( + model_name='electricstorageinputs', + name='installed_cost_constant', + field=models.FloatField(blank=True, help_text='Fixed upfront cost for battery installation, independent of size.', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000000000.0)]), + ), + migrations.AlterField( + model_name='electricstorageinputs', + name='installed_cost_per_kw', + field=models.FloatField(blank=True, help_text='Total upfront battery power capacity costs (e.g. inverter and balance of power systems)', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10000.0)]), + ), + migrations.AlterField( + model_name='electricstorageinputs', + name='installed_cost_per_kwh', + field=models.FloatField(blank=True, help_text='Total upfront battery costs', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10000.0)]), + ), + ] From b71d82b89f983ed671ff3a2e03b9f45dbc473038 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Thu, 8 Jan 2026 19:32:41 -0500 Subject: [PATCH 03/23] debug endpoint for storage size class --- reoptjl/urls.py | 1 + reoptjl/views.py | 20 +++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/reoptjl/urls.py b/reoptjl/urls.py index 6de54a354..c5ce4ded5 100644 --- a/reoptjl/urls.py +++ b/reoptjl/urls.py @@ -27,6 +27,7 @@ re_path(r'^job/generate_results_table/?$', views.generate_results_table), re_path(r'^get_ashp_defaults/?$', views.get_ashp_defaults), re_path(r'^pv_cost_defaults/?$', views.pv_cost_defaults), + re_path(r'^electric_storage_cost_defaults/?$', views.electric_storage_cost_defaults), re_path(r'^summary_by_runuuids/?$', views.summary_by_runuuids), re_path(r'^link_run_to_portfolios/?$', views.link_run_uuids_to_portfolio_uuid), re_path(r'^get_load_metrics/?$', views.get_load_metrics), diff --git a/reoptjl/views.py b/reoptjl/views.py index cc79247df..05ced0e23 100644 --- a/reoptjl/views.py +++ b/reoptjl/views.py @@ -581,21 +581,19 @@ def electric_storage_cost_defaults(request): inputs = json.loads(request.body) else: inputs = { - "installed_cost_per_kw": request.GET.get("installed_cost_per_kw"), - "installed_cost_per_kwh": request.GET.get("installed_cost_per_kwh"), - "installed_cost_constant" : request.GET.get("installed_cost_constant"), - "size_class" : request.GET.get("size_class"), - "min_kw": request.GET.get("min_kw"), - "max_kw": request.GET.get("max_kw"), - "electric_load_annual_peak": request.GET.get("electric_load_annual_peak"), - "electric_load_average": request.GET.get("electric_load_average") + "installed_cost_per_kw": request.GET.get("installed_cost_per_kw") or None, + "installed_cost_per_kwh": request.GET.get("installed_cost_per_kwh") or None, + "installed_cost_constant" : request.GET.get("installed_cost_constant") or None, + "size_class" : request.GET.get("size_class") or None, + "min_kw": request.GET.get("min_kw") or 0, + "max_kw": request.GET.get("max_kw") or 1.0e9, + "electric_load_annual_peak": request.GET.get("electric_load_annual_peak") or 0, + "electric_load_average": request.GET.get("electric_load_average") or 0 } - inputs = {k: v for k, v in inputs.items() if v is not None} - try: julia_host = os.environ.get('JULIA_HOST', "julia") - http_jl_response = requests.get("http://" + julia_host + ":8081/pv_cost_defaults/", json=inputs) + http_jl_response = requests.get("http://" + julia_host + ":8081/electric_storage_cost_defaults/", json=inputs) response = JsonResponse( http_jl_response.json() ) From 9a2672391767ce95d716af439ad9f5ea1135ecc2 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Thu, 10 Sep 2026 14:34:21 -0400 Subject: [PATCH 04/23] revive bess size class api branch --- julia_src/Manifest.toml | 4 +++- julia_src/http.jl | 2 +- ...e.py => 0126_electricstorageinputs_size_class_and_more.py} | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) rename reoptjl/migrations/{0114_electricstorageinputs_size_class_and_more.py => 0126_electricstorageinputs_size_class_and_more.py} (93%) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index f5919635b..c49793b98 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -966,7 +966,9 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "57012c263c02d4d1362b4e248accbe3974e17c74" +git-tree-sha1 = "cbd0675c03f309a4a8bf4ff8048783d2c9c59f79" +repo-rev = "electric_storage_size_class" +repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.61.1" diff --git a/julia_src/http.jl b/julia_src/http.jl index acc6603a4..6016531ac 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -278,7 +278,7 @@ function reopt(req::HTTP.Request) end if haskey(d, "ElectricStorage") inputs_with_defaults_from_julia_electric_storage = [ - :macrs_option_years, :macrs_bonus_fraction, :total_itc_fraction, :internal_efficiency_fraction + :macrs_option_years, :macrs_bonus_fraction, :total_itc_fraction, :internal_efficiency_fraction, :size_class ] electric_storage_dict = Dict(key=>getfield(model_inputs.s.storage.attr["ElectricStorage"], key) for key in inputs_with_defaults_from_julia_electric_storage) else diff --git a/reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py b/reoptjl/migrations/0126_electricstorageinputs_size_class_and_more.py similarity index 93% rename from reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py rename to reoptjl/migrations/0126_electricstorageinputs_size_class_and_more.py index 7179fd9bf..ba50fb8d5 100644 --- a/reoptjl/migrations/0114_electricstorageinputs_size_class_and_more.py +++ b/reoptjl/migrations/0126_electricstorageinputs_size_class_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.26 on 2026-01-08 23:39 +# Generated by Django 4.2.26 on 2026-09-10 17:12 import django.core.validators from django.db import migrations, models @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('reoptjl', '0113_merge_20251209_2338'), + ('reoptjl', '0125_chpoutputs_annual_thermal_curtailed_mmbtu_and_more'), ] operations = [ From 10f05ea5f0fd2839bbb22251e2231a997e8c8089 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Thu, 10 Sep 2026 17:28:55 -0400 Subject: [PATCH 05/23] address copilot comments --- julia_src/http.jl | 4 +-- reoptjl/models.py | 4 +-- reoptjl/test/test_job_endpoint.py | 44 ++++++++++++++++++++++++++++++- reoptjl/views.py | 2 +- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/julia_src/http.jl b/julia_src/http.jl index 6016531ac..4548fabbb 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -278,7 +278,7 @@ function reopt(req::HTTP.Request) end if haskey(d, "ElectricStorage") inputs_with_defaults_from_julia_electric_storage = [ - :macrs_option_years, :macrs_bonus_fraction, :total_itc_fraction, :internal_efficiency_fraction, :size_class + :macrs_option_years, :macrs_bonus_fraction, :total_itc_fraction, :internal_efficiency_fraction, :size_class, :installed_cost_per_kw, :installed_cost_per_kwh, :installed_cost_constant ] electric_storage_dict = Dict(key=>getfield(model_inputs.s.storage.attr["ElectricStorage"], key) for key in inputs_with_defaults_from_julia_electric_storage) else @@ -914,7 +914,7 @@ function electric_storage_cost_defaults(req::HTTP.Request) response = data return HTTP.Response(200, JSON.json(response)) else - @info "An error occured in the electric_storage_cost_defaults endpoint" + @info "An error occurred in the electric_storage_cost_defaults endpoint" return HTTP.Response(500, JSON.json(error_response)) end end diff --git a/reoptjl/models.py b/reoptjl/models.py index 6848c2135..a71cd7d31 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -3671,11 +3671,11 @@ class ElectricStorageInputs(BaseModel, models.Model): size_class = models.IntegerField( validators=[ MinValueValidator(1), - MaxValueValidator(5) + MaxValueValidator(4) ], null=True, blank=True, - help_text="ElectricStorage size class. Must be an integer value between 1 and 3. Default is calculated per ratio of annual peak and average load of given load profile." + help_text="ElectricStorage size class. Must be an integer value between 1 and 4. Default is calculated per ratio of annual peak and average load of given load profile." ) ELECTRICSTORAGE_DISPATCH_STRATEGY = models.TextChoices('ELECTRICSTORAGE_DISPATCH_STRATEGY', ( "optimized", diff --git a/reoptjl/test/test_job_endpoint.py b/reoptjl/test/test_job_endpoint.py index 82e3f671e..7bfde5225 100644 --- a/reoptjl/test/test_job_endpoint.py +++ b/reoptjl/test/test_job_endpoint.py @@ -420,4 +420,46 @@ def test_pv_cost_defaults_update_from_julia(self): r = json.loads(resp.content) self.assertEqual(r["inputs"]["PV"]["size_class"], 2) - self.assertAlmostEqual(r["inputs"]["PV"]["installed_cost_per_kw"], 2914.6, delta=0.05 * 2914.6) \ No newline at end of file + self.assertAlmostEqual(r["inputs"]["PV"]["installed_cost_per_kw"], 2914.6, delta=0.05 * 2914.6) + + def test_electric_storage_cost_defaults_update_from_julia(self): + + input_data = dict() + + input_data["Financial"] = dict() + input_data["Financial"]["analysis_years"] = 20 + input_data["Financial"]["offtaker_discount_rate_fraction"] = 0.06 + input_data["Financial"]["offtaker_tax_rate_fraction"] = 0.26 + input_data["Financial"]["elec_cost_escalation_rate_fraction"] = 0.03 + input_data["Financial"]["om_cost_escalation_rate_fraction"] = 0.02 + + input_data["ElectricStorage"] = dict() + input_data["ElectricStorage"]["total_itc_fraction"] = 0.0 + input_data["ElectricStorage"]["macrs_option_years"] = 0 + input_data["ElectricStorage"]["macrs_bonus_fraction"] = 0.0 + + input_data["ElectricLoad"] = dict() + # Average load is 250 kw + input_data["ElectricLoad"]["loads_kw"] = [250.0] * 8760 + # Peak load determines size class. We use size class bounds to vary size class. + input_data["ElectricLoad"]["loads_kw"][6000] = 250.0 + 39 + input_data["ElectricLoad"]["year"] = 2025 + + input_data["Site"] = dict() + input_data["Site"]["longitude"] = -118.1164613 + input_data["Site"]["latitude"] = 34.5794343 + + input_data["ElectricTariff"] = dict() + input_data["ElectricTariff"]["blended_annual_energy_rate"] = 0.12 + input_data["ElectricTariff"]["blended_annual_demand_rate"] = 12.0 + + resp = self.api_client.post('/stable/job/', format='json', data=input_data) + self.assertHttpCreated(resp) + r = json.loads(resp.content) + run_uuid = r.get('run_uuid') + + resp = self.api_client.get(f'/stable/job/{run_uuid}/results') + r = json.loads(resp.content) + + self.assertEqual(r["inputs"]["ElectricStorage"]["size_class"], 1) + self.assertAlmostEqual(r["inputs"]["PV"]["installed_cost_per_kw"], 705) \ No newline at end of file diff --git a/reoptjl/views.py b/reoptjl/views.py index aae28615c..ca6ca76ef 100644 --- a/reoptjl/views.py +++ b/reoptjl/views.py @@ -631,7 +631,7 @@ def electric_storage_cost_defaults(request): except Exception: exc_type, exc_value, exc_traceback = sys.exc_info() - debug_msg = "exc_type: {}; exc_value: {}; exc_traceback: {}".format(exc_type, exc_value.args[0], + debug_msg = "exc_type: {}; exc_value: {}; exc_traceback: {}".format(str(exc_type), exc_value.args[0], tb.format_tb(exc_traceback)) log.debug(debug_msg) return JsonResponse({"Error": "Unexpected error in electric_storage_cost_defaults endpoint. Check log for more."}, status=500) From d0ad6b260466b01942e0c8f5492692db0680c99e Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 14 Sep 2026 13:35:56 -0600 Subject: [PATCH 06/23] Update GhpGhx.jl to updated julia 1.13 syntax for ccall --- julia_src/Manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index f5919635b..568399695 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -422,11 +422,11 @@ uuid = "0329782f-3d07-4b52-b9f6-d3137cf03c7a" version = "1.1.0" [[deps.GhpGhx]] -git-tree-sha1 = "083432c889da260c5d88e3a16d1fb93b67652bfa" -repo-rev = "main" +git-tree-sha1 = "b0872962491469f3ae03e130dcd49cca4f19f432" +repo-rev = "fix-ccall-lib-name-julia-113" repo-url = "https://github.com/NatLabRockies/GhpGhx.jl.git" uuid = "7ce85f02-24a8-4d69-a3f0-14b5daa7d30c" -version = "0.1.0" +version = "0.1.1" [[deps.Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] From abf3e4442e9302c4968a7d7e65c3c20297aee25d Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 14 Sep 2026 13:43:42 -0600 Subject: [PATCH 07/23] Update Julia dependencies but still on 1.11 --- julia_src/Manifest.toml | 162 ++++++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 72 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 568399695..b9045f5a5 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -5,10 +5,10 @@ manifest_format = "2.0" project_hash = "ec55826241d3e720ba54fed81f64f717317610d9" [[deps.ASL_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6252039f98492252f9e47c312c8ffda0e3b9e78d" +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "21a22cd1a6d45034933824665cfb874ec425a14b" uuid = "ae81ac8f-d209-56e5-92de-9978fef736f9" -version = "0.1.3+0" +version = "0.1.5+0" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] @@ -108,27 +108,27 @@ version = "0.10.17" [[deps.Cbc]] deps = ["Cbc_jll", "LinearAlgebra", "MathOptInterface", "OpenBLAS32_jll", "SparseArrays"] -git-tree-sha1 = "bd80360768af12c1376c075665700794c4fc29c7" +git-tree-sha1 = "95ffc41af299f4001a325b48c279313d8bdec86b" uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76" -version = "1.3.0" +version = "1.4.0" [[deps.Cbc_jll]] deps = ["ASL_jll", "Artifacts", "Cgl_jll", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Osi_jll", "libblastrampoline_jll"] -git-tree-sha1 = "5de4960bd3e7232ebf15361fb9f764a32eabf1ff" +git-tree-sha1 = "69a94244dc10e76efb1aa81df43486982544a692" uuid = "38041ee0-ae04-5750-a4d2-bb4d0d83d27d" -version = "200.1000.1200+0" +version = "200.1000.1300+0" [[deps.Cgl_jll]] deps = ["Artifacts", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Osi_jll"] -git-tree-sha1 = "3f6d683189c4d51034b42bc3686e84623cc0fd6b" +git-tree-sha1 = "5bd76190937bec133ec21b3b356cbb125b368e9f" uuid = "3830e938-1dd0-5f3e-8b8e-b3ee43226782" -version = "0.6000.900+0" +version = "0.6000.1000+0" [[deps.Clp_jll]] deps = ["Artifacts", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "METIS_jll", "MUMPS_seq_jll", "Osi_jll", "libblastrampoline_jll"] -git-tree-sha1 = "341bae15d4036af465aa41650547b2829308ad95" +git-tree-sha1 = "d54e31804f9bcd3e727fbf203772a14119fc4344" uuid = "06985876-5285-5a41-9fcb-8948a742cc53" -version = "100.1700.1000+1" +version = "100.1700.1101+0" [[deps.CodecBzip2]] deps = ["Bzip2_jll", "TranscodingStreams"] @@ -144,9 +144,9 @@ version = "0.7.9" [[deps.CoinUtils_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"] -git-tree-sha1 = "db9575b900876ab5067dcface16dca5bca0e93c4" +git-tree-sha1 = "d447eb7bd8ec21d7e80c1174c9f299217b7a48ed" uuid = "be027038-0da8-5614-b30d-e42594cb92df" -version = "200.1100.1200+0" +version = "200.1100.1300+1" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -315,9 +315,9 @@ version = "0.1.11" [[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "f4d39eee89f1e58c26bf447f1d4156c0125d6838" +git-tree-sha1 = "2bfb1e047e2ad0a5ca94365340bde8005d637568" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.8.3+0" +version = "2.8.4+0" [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" @@ -357,9 +357,9 @@ version = "0.8.6" [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] -git-tree-sha1 = "1b86cca764a61dcac4fef4c5e16e378e5ed6953c" +git-tree-sha1 = "3b0f72e2ffef1a139ac450725c9ecd01c0a3c050" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "1.4.5" +version = "1.4.6" [deps.ForwardDiff.extensions] ForwardDiffStaticArraysExt = "StaticArrays" @@ -379,10 +379,10 @@ uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" version = "1.4.0" [[deps.GDAL_jll]] -deps = ["Artifacts", "Expat_jll", "GEOS_jll", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "LibPQ_jll", "Libdl", "Libtiff_jll", "NetCDF_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "libgeotiff_jll"] -git-tree-sha1 = "ac63c49efd5afe2054b044926c7f112c1cb31d25" +deps = ["Artifacts", "Expat_jll", "GEOS_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "libgeotiff_jll"] +git-tree-sha1 = "e9604365601f34d669dac3609fa4870803bdea9b" uuid = "a7073274-a066-55f0-b90d-d619367d196c" -version = "300.500.200+0" +version = "300.500.101+0" [[deps.GEOS_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -453,10 +453,10 @@ version = "0.17.3" MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195" [[deps.HDF5_jll]] -deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "4cc2bb72df6ff40b055295fdef6d92955f9dede8" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] +git-tree-sha1 = "38c8874692d48d5440d5752d6c74b0c6b0b60739" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.12.2+2" +version = "1.14.2+1" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] @@ -466,15 +466,15 @@ version = "1.11.0" [[deps.HiGHS]] deps = ["HiGHS_jll", "LinearAlgebra", "MathOptIIS", "MathOptInterface", "OpenBLAS32_jll", "PrecompileTools", "SparseArrays"] -git-tree-sha1 = "01a5241985559c08a5baadbcebd6d87daaf84a84" +git-tree-sha1 = "49e52c3ac9237447b602335f1a4a2903f567c1ea" uuid = "87dc4568-4c63-4d18-b0c0-bb2238e4078b" -version = "1.24.1" +version = "1.25.3" [[deps.HiGHS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Zlib_jll", "libblastrampoline_jll"] -git-tree-sha1 = "2d9747b79d17c4320fe48048a3a768fe6d6d82de" +git-tree-sha1 = "d4e63f395d10590fcece8d35005dd7b9a4862635" uuid = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea" -version = "1.15.1+1" +version = "1.15.1+3" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XML2_jll", "Xorg_libpciaccess_jll"] @@ -489,9 +489,9 @@ uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" version = "0.9.4" [[deps.InlineStrings]] -git-tree-sha1 = "8f3d257792a522b4601c24a577954b0a8cd7334d" +git-tree-sha1 = "06b65886c7577a3784d616e29f1302c2e36e389d" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" -version = "1.4.5" +version = "1.4.6" [deps.InlineStrings.extensions] ArrowTypesExt = "ArrowTypes" @@ -534,9 +534,9 @@ version = "1.3.1" [[deps.Ipopt_jll]] deps = ["ASL_jll", "Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "MUMPS_seq_jll", "SPRAL_jll", "libblastrampoline_jll"] -git-tree-sha1 = "b33cbc78b8d4de87d18fcd705054a82e2999dbac" +git-tree-sha1 = "0e144b24f0cfa8c5bfefcfdbdaae76132597394b" uuid = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7" -version = "300.1400.1900+0" +version = "300.1400.2000+1" [[deps.IrrationalConstants]] git-tree-sha1 = "b2d91fe939cae05960e760110b328288867b5758" @@ -589,18 +589,18 @@ version = "1.31.2" [deps.JuMP.weakdeps] DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0" -[[deps.Kerberos_krb5_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "0f2899fdadaab4b8f57db558ba21bdb4fb52f1f0" -uuid = "b39eb1a6-c29a-53d7-8c32-632cd16f18da" -version = "1.21.3+0" - [[deps.LERC_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" version = "3.0.0+1" +[[deps.LLVMOpenMP_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "e5b100780d4d30d63b4618d7930d48af409c1772" +uuid = "1d63c593-3942-5779-bab2-d838dc0a180e" +version = "23.1.1+0" + [[deps.LRUCache]] git-tree-sha1 = "5519b95a490ff5fe629c4a7aa3b3dfc9160498b3" uuid = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637" @@ -640,12 +640,6 @@ deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" version = "1.7.2+0" -[[deps.LibPQ_jll]] -deps = ["Artifacts", "JLLWrappers", "Kerberos_krb5_jll", "Libdl", "OpenSSL_jll", "Pkg"] -git-tree-sha1 = "a299629703a93d8efcefccfc16b18ad9a073d131" -uuid = "08be9ffa-1c94-5ee5-a977-46a84ec9b350" -version = "14.3.0+1" - [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" @@ -717,27 +711,39 @@ uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" version = "1.10.1+0" [[deps.METIS_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1c20a46719c0dc4ec4e7021ca38f53e1ec9268d9" +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "2eefa8baa858871ae7770c98c3c2a7e46daba5b4" uuid = "d00139f3-1899-568f-a2f0-47f597d42d70" -version = "5.1.2+1" +version = "5.1.3+0" [[deps.MPFR_jll]] deps = ["Artifacts", "GMP_jll", "Libdl"] uuid = "3a97d323-0669-5f0c-9066-3539efd106a3" version = "4.2.1+0" +[[deps.MPICH_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "07dbec8aab01696edc0151a401a6cdfe95b9b885" +uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" +version = "5.0.1+0" + [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] git-tree-sha1 = "8e98d5d80b87403c311fd51e8455d4546ba7a5f8" uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.12" +[[deps.MPItrampoline_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "675df097f8eeb28998b2cfe3b25655af73d5f7df" +uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" +version = "5.5.6+0" + [[deps.MUMPS_seq_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "METIS_jll", "libblastrampoline_jll"] -git-tree-sha1 = "fc0c8442887b48c15aec2b1787a5fc812a99b2fd" +git-tree-sha1 = "fc1daa0ab5a0d7a0a34d5168a711cbf02b2cb0cc" uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d" -version = "500.800.100+0" +version = "500.900.100+0" [[deps.MacroTools]] git-tree-sha1 = "1e0228a030642014fe5cfe68c2c0a818f9e3f522" @@ -785,6 +791,12 @@ deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" version = "2.28.6+0" +[[deps.MicrosoftMPI_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "bc95bf4149bf535c09602e3acdf950d9b4376227" +uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" +version = "10.1.4+3" + [[deps.Missings]] deps = ["DataAPI"] git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" @@ -823,12 +835,6 @@ git-tree-sha1 = "095850bc2a585bb20cad8d8f6f9f643d11b49a3d" uuid = "68e3532b-a499-55ff-9963-d1c0c0748b3a" version = "6.6.0+2" -[[deps.NetCDF_jll]] -deps = ["Artifacts", "HDF5_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "XML2_jll", "Zlib_jll"] -git-tree-sha1 = "7f5a03e6712f5447c9c344430b8d1927a4777483" -uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" -version = "400.902.206+0" - [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" @@ -866,6 +872,12 @@ deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" version = "0.8.1+2" +[[deps.OpenMPI_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"] +git-tree-sha1 = "6d6c0ca4824268c1a7dca1f4721c535ac63d9074" +uuid = "fe0851c0-eecd-5654-98d4-656369965a5c" +version = "5.0.11+0" + [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"] git-tree-sha1 = "1d1aaa7d449b58415f97d2839c318b70ffb525a0" @@ -874,9 +886,9 @@ version = "1.6.1" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "ad31332567b189f508a3ea8957a2640b1147ab00" +git-tree-sha1 = "7787087cbc5ec110986e94d9aa1f17639a79c5de" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.23+1" +version = "3.5.8+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] @@ -891,9 +903,9 @@ version = "2.0.1" [[deps.Osi_jll]] deps = ["Artifacts", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"] -git-tree-sha1 = "95ce36c3c9095e409931631702446d44ebfa4e3b" +git-tree-sha1 = "e2316ca10132567419b6d600fd8b4077ee531d69" uuid = "7da25872-d9ce-5375-a4d3-7a845f58efdd" -version = "0.10800.1100+0" +version = "0.10800.1200+1" [[deps.PROJ_jll]] deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "Pkg", "SQLite_jll"] @@ -909,9 +921,9 @@ version = "0.5.12" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] -git-tree-sha1 = "3de8f5e6e90ebfa8d6d1f86997d6cdcd6a912ff3" +git-tree-sha1 = "ba0dc8a8a67cacac4842631f960c046e4e563675" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.8.7" +version = "2.8.8" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -936,9 +948,9 @@ version = "1.2.1" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "8b770b60760d4451834fe79dd483e318eee709c4" +git-tree-sha1 = "5005266de4bfe50e53ff44a5cb5c540b6e47a254" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.5.2" +version = "1.6.0" [[deps.PrettyTables]] deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"] @@ -1033,15 +1045,15 @@ version = "0.12.8" [[deps.SCIP_PaPILO_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "GMP_jll", "Ipopt_jll", "JLLWrappers", "Libdl", "MPFR_jll", "OpenBLAS32_jll", "Readline_jll", "Zlib_jll", "bliss_jll", "boost_jll", "oneTBB_jll"] -git-tree-sha1 = "8a2620efef3f9232c21c21dae32f9c0979050f84" +git-tree-sha1 = "26d0bb9092bc1e0185598496414282e0d4d16869" uuid = "fc9abe76-a5e6-5fed-b0b7-a12f309cf031" -version = "1000.0.300+0" +version = "1000.0.301+0" [[deps.SCIP_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "GMP_jll", "Ipopt_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Readline_jll", "Zlib_jll", "boost_jll"] -git-tree-sha1 = "b576dc43ef411f0008e5dff18ebb29d7284a2d1e" +git-tree-sha1 = "7f0dbabfccaea18076c829c561d462183f7f2b8e" uuid = "e5ac4fe4-a920-5659-9bf8-f9f73e9e79ce" -version = "1000.0.300+0" +version = "1000.0.301+0" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -1049,9 +1061,9 @@ version = "0.7.0" [[deps.SPRAL_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "METIS_jll", "libblastrampoline_jll"] -git-tree-sha1 = "4f9833187a65ead66ed1907b44d5f20606282e3f" +git-tree-sha1 = "b78d602475715c9c6ea21c9650fa5dba58e9945b" uuid = "319450e9-13b8-58e8-aa9f-8fd1420848ab" -version = "2025.5.20+0" +version = "2025.9.18+1" [[deps.SQLite_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -1114,9 +1126,9 @@ version = "1.4.4" [[deps.Statistics]] deps = ["LinearAlgebra"] -git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0" +git-tree-sha1 = "e2b53ce13a53367e96601081e33d34746b571bad" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -version = "1.11.1" +version = "1.11.5" weakdeps = ["SparseArrays"] [deps.Statistics.extensions] @@ -1197,9 +1209,9 @@ version = "1.11.0" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "57e1b2c9de4bd6f40ecb9de4ac1797b81970d008" +git-tree-sha1 = "1f0f9f401753701a7e4113b5056ca38d33875b55" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.28.0" +version = "1.29.0" [deps.Unitful.extensions] ConstructionBaseUnitfulExt = "ConstructionBase" @@ -1270,6 +1282,12 @@ git-tree-sha1 = "25fb6ecbb784a45f8ea74584fa631a9e85393dd0" uuid = "28df3c45-c428-5900-9ff8-a3135698ca75" version = "1.87.0+0" +[[deps.libaec_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "60f4792734488db6f42e2c7699f1d4594780bd03" +uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" +version = "1.1.7+0" + [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" From 421c9da2657b6d87e5d7df2ffa0f165641a9daad Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 14 Sep 2026 15:43:16 -0600 Subject: [PATCH 08/23] Update to Julia v1.13 --- julia_src/Dockerfile | 2 +- julia_src/Manifest.toml | 280 +++++++++++++++++++++++++++++++--------- julia_src/Project.toml | 5 +- 3 files changed, 225 insertions(+), 62 deletions(-) diff --git a/julia_src/Dockerfile b/julia_src/Dockerfile index 46201db0a..b45a4bb17 100644 --- a/julia_src/Dockerfile +++ b/julia_src/Dockerfile @@ -1,4 +1,4 @@ -FROM julia:1.11.2 +FROM julia:1.13.0 # Install NLR root certs for machines running on NLR's network. ARG NREL_ROOT_CERT_URL_ROOT="" diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index b9045f5a5..64260c37f 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -1,18 +1,20 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.11.2" -manifest_format = "2.0" -project_hash = "ec55826241d3e720ba54fed81f64f717317610d9" +julia_version = "1.13.0" +manifest_format = "2.1" +project_hash = "fc22894309b8f27c983e7be2f1d0fefc50982e9f" [[deps.ASL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "21a22cd1a6d45034933824665cfb874ec425a14b" +registries = "General" uuid = "ae81ac8f-d209-56e5-92de-9978fef736f9" version = "0.1.5+0" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] git-tree-sha1 = "d92ad398961a3ed262d8bf04a1a2b8340f915fef" +registries = "General" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.5.0" @@ -27,6 +29,7 @@ version = "1.5.0" [[deps.Accessors]] deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"] git-tree-sha1 = "7063ad1083578215c7c4bf410368150abe8d5524" +registries = "General" uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" version = "0.1.45" @@ -51,6 +54,7 @@ version = "0.1.45" [[deps.ArchGDAL]] deps = ["CEnum", "ColorTypes", "Dates", "DiskArrays", "Extents", "GDAL", "GDAL_jll", "GeoFormatTypes", "GeoInterface", "GeoInterfaceRecipes", "ImageCore", "Tables"] git-tree-sha1 = "edfaf8e5f8d57cabcd98399b0b727bce22bb4d9c" +registries = "General" uuid = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" version = "0.9.4" @@ -65,6 +69,7 @@ version = "1.11.0" [[deps.AxisArrays]] deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] git-tree-sha1 = "4126b08903b777c88edf1754288144a0492c05ad" +registries = "General" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" version = "0.4.8" @@ -74,113 +79,132 @@ version = "1.11.0" [[deps.BitFlags]] git-tree-sha1 = "bbe1079eecf9c9fbb52765193ad2bae27ae09bc8" +registries = "General" uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" version = "0.1.10" [[deps.Blosc]] deps = ["Blosc_jll"] git-tree-sha1 = "310b77648d38c223d947ff3f50f511d08690b8d5" +registries = "General" uuid = "a74b3585-a348-5f62-a45c-50e91977d574" version = "0.7.3" [[deps.Blosc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Lz4_jll", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "535c80f1c0847a4c967ea945fca21becc9de1522" +registries = "General" uuid = "0b7ba130-8d10-5ba8-a3d6-c5182647fed9" version = "1.21.7+0" [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "1b96ea4a01afe0ea4090c5c8039690672dd13f2e" +registries = "General" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" version = "1.0.9+0" [[deps.CEnum]] git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90" +registries = "General" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" version = "0.4.2" [[deps.CSV]] deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"] git-tree-sha1 = "abed1e735dd4152f48c90cf0767e1790e25f332f" +registries = "General" uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" version = "0.10.17" [[deps.Cbc]] deps = ["Cbc_jll", "LinearAlgebra", "MathOptInterface", "OpenBLAS32_jll", "SparseArrays"] git-tree-sha1 = "95ffc41af299f4001a325b48c279313d8bdec86b" +registries = "General" uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76" version = "1.4.0" [[deps.Cbc_jll]] deps = ["ASL_jll", "Artifacts", "Cgl_jll", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Osi_jll", "libblastrampoline_jll"] git-tree-sha1 = "69a94244dc10e76efb1aa81df43486982544a692" +registries = "General" uuid = "38041ee0-ae04-5750-a4d2-bb4d0d83d27d" version = "200.1000.1300+0" [[deps.Cgl_jll]] deps = ["Artifacts", "Clp_jll", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Osi_jll"] git-tree-sha1 = "5bd76190937bec133ec21b3b356cbb125b368e9f" +registries = "General" uuid = "3830e938-1dd0-5f3e-8b8e-b3ee43226782" version = "0.6000.1000+0" [[deps.Clp_jll]] deps = ["Artifacts", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "METIS_jll", "MUMPS_seq_jll", "Osi_jll", "libblastrampoline_jll"] git-tree-sha1 = "d54e31804f9bcd3e727fbf203772a14119fc4344" +registries = "General" uuid = "06985876-5285-5a41-9fcb-8948a742cc53" version = "100.1700.1101+0" [[deps.CodecBzip2]] deps = ["Bzip2_jll", "TranscodingStreams"] git-tree-sha1 = "84990fa864b7f2b4901901ca12736e45ee79068c" +registries = "General" uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd" version = "0.8.5" [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] git-tree-sha1 = "970758a3d591a2a5c2a907c53f2e2f8c1b1d3537" +registries = "General" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" version = "0.7.9" [[deps.CoinUtils_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"] git-tree-sha1 = "d447eb7bd8ec21d7e80c1174c9f299217b7a48ed" +registries = "General" uuid = "be027038-0da8-5614-b30d-e42594cb92df" version = "200.1100.1300+1" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] git-tree-sha1 = "b10d0b65641d57b8b4d5e234446582de5047050d" +registries = "General" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.11.5" [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"] git-tree-sha1 = "600cc5508d66b78aae350f7accdb58763ac18589" +registries = "General" uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" version = "0.9.10" [[deps.Colors]] deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] git-tree-sha1 = "362a287c3aa50601b0bc359053d5c2468f0e7ce0" +registries = "General" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.11" [[deps.CommonSolve]] deps = ["PrecompileTools"] git-tree-sha1 = "6c389fa857f6ca5a95474b52a52023fd77f24cb7" +registries = "General" uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" version = "0.2.14" [[deps.CommonSubexpressions]] deps = ["MacroTools"] git-tree-sha1 = "cda2cfaebb4be89c9084adaca7dd7333369715c5" +registries = "General" uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.3.1" [[deps.Compat]] deps = ["TOML", "UUIDs"] git-tree-sha1 = "9d8a54ce4b17aa5bdce0ea5c34bc5e7c340d16ad" +registries = "General" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" version = "4.18.1" weakdeps = ["Dates", "LinearAlgebra"] @@ -191,10 +215,11 @@ weakdeps = ["Dates", "LinearAlgebra"] [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "1.1.1+0" +version = "1.5.5+2" [[deps.CompositionsBase]] git-tree-sha1 = "802bb88cd69dfd1509f6670416bd4434015693ad" +registries = "General" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" version = "0.1.2" weakdeps = ["InverseFunctions"] @@ -205,11 +230,13 @@ weakdeps = ["InverseFunctions"] [[deps.ConcurrentUtilities]] deps = ["Serialization", "Sockets"] git-tree-sha1 = "3c9be947934c38475bafe822c6d61aaed17f0738" +registries = "General" uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb" version = "2.6.0" [[deps.ConstructionBase]] git-tree-sha1 = "b4b092499347b18a015186eae3042f72267106cb" +registries = "General" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" version = "1.6.0" @@ -226,39 +253,46 @@ version = "1.6.0" [[deps.CoolProp]] deps = ["CoolProp_jll", "Markdown", "Unitful"] git-tree-sha1 = "94062163b5656b1351f7f7a784341b8fe13c1ca1" +registries = "General" uuid = "e084ae63-2819-5025-826e-f8e611a84251" version = "0.1.0" [[deps.CoolProp_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "cf0dc48f908a09d11bd8bccaff8654994f5ba844" +registries = "General" uuid = "3351c21f-4feb-5f29-afb9-f4fcb0e27549" version = "6.8.0+0" [[deps.Crayons]] git-tree-sha1 = "54b76cbb40d9a0f5368c880725b2f141da77c94f" +registries = "General" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.2.0" [[deps.DataAPI]] git-tree-sha1 = "abe83f3a2f1b857aac70ef8b269080af17764bbe" +registries = "General" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" version = "1.16.0" [[deps.DataFrames]] deps = ["Compat", "DataAPI", "DataStructures", "Future", "InlineStrings", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrecompileTools", "PrettyTables", "Printf", "Random", "Reexport", "SentinelArrays", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] git-tree-sha1 = "5fab31e2e01e70ad66e3e24c968c264d1cf166d6" +registries = "General" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" version = "1.8.2" [[deps.DataStructures]] deps = ["OrderedCollections"] git-tree-sha1 = "b0bc6d2cad1fed8b7fd59a1551a991cb3d2809e6" +registries = "General" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" version = "0.19.6" [[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" +registries = "General" uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" version = "1.0.0" @@ -270,63 +304,73 @@ version = "1.11.0" [[deps.DelimitedFiles]] deps = ["Mmap"] git-tree-sha1 = "9e2f36d3c96a820c678f2f1f1782582fcf685bae" +registries = "General" uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" [[deps.DiffResults]] deps = ["StaticArraysCore"] git-tree-sha1 = "782dd5f4561f5d267313f23853baaaa4c52ea621" +registries = "General" uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" version = "1.1.0" [[deps.DiffRules]] deps = ["IrrationalConstants", "LogExpFunctions", "NaNMath", "Random", "SpecialFunctions"] git-tree-sha1 = "79a2aca180a85c690c58a020d47b426954b590f8" +registries = "General" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.16.0" [[deps.DiskArrays]] deps = ["LRUCache", "OffsetArrays"] git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" +registries = "General" uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" version = "0.3.23" [[deps.DocStringExtensions]] git-tree-sha1 = "7442a5dfe1ebb773c29cc2962a8980f47221d76c" +registries = "General" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.9.5" [[deps.DotEnv]] deps = ["PrecompileTools"] git-tree-sha1 = "92e88cb68a5b10545234f46dfaeb2fa8a8a50c45" +registries = "General" uuid = "4dc1fcf4-5e3b-5448-94ab-0c38ec0385c1" version = "1.0.0" [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -version = "1.6.0" +version = "1.7.0" [[deps.ExceptionUnwrapping]] deps = ["Test"] git-tree-sha1 = "d36f682e590a83d63d1c7dbd287573764682d12a" +registries = "General" uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4" version = "0.1.11" [[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "2bfb1e047e2ad0a5ca94365340bde8005d637568" +registries = "General" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" version = "2.8.4+0" [[deps.Extents]] git-tree-sha1 = "b309b36a9e02fe7be71270dd8c0fd873625332b4" +registries = "General" uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" version = "0.1.6" [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] git-tree-sha1 = "6621fef488e496356c9c9625d0562c12a6070819" +registries = "General" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" version = "1.20.0" weakdeps = ["HTTP"] @@ -337,6 +381,7 @@ weakdeps = ["HTTP"] [[deps.FilePathsBase]] deps = ["Compat", "Dates"] git-tree-sha1 = "3bab2c5aa25e7840a4b065805c0cdfc01f3068d2" +registries = "General" uuid = "48062228-2e41-5def-b9a4-89aafe57970f" version = "0.9.24" weakdeps = ["Mmap", "Test"] @@ -352,12 +397,14 @@ version = "1.11.0" [[deps.FixedPointNumbers]] deps = ["Random", "Statistics"] git-tree-sha1 = "59af96b98217c6ef4ae0dfe065ac7c20831d1a84" +registries = "General" uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.8.6" [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] git-tree-sha1 = "3b0f72e2ffef1a139ac450725c9ecd01c0a3c050" +registries = "General" uuid = "f6369f11-7733-5829-9624-2563aa707210" version = "1.4.6" @@ -375,34 +422,39 @@ version = "1.11.0" [[deps.GDAL]] deps = ["CEnum", "GDAL_jll", "NetworkOptions", "PROJ_jll"] git-tree-sha1 = "9ce70502472a9f23f8889f0f9e2be8451413fe7b" +registries = "General" uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" version = "1.4.0" [[deps.GDAL_jll]] deps = ["Artifacts", "Expat_jll", "GEOS_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "libgeotiff_jll"] git-tree-sha1 = "e9604365601f34d669dac3609fa4870803bdea9b" +registries = "General" uuid = "a7073274-a066-55f0-b90d-d619367d196c" version = "300.500.101+0" [[deps.GEOS_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "818ab247de98d8848a022c7be084b1283d912326" +registries = "General" uuid = "d604d12d-fa86-5845-992e-78dc15976526" version = "3.11.2+0" [[deps.GMP_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d" -version = "6.3.0+0" +version = "6.3.0+2" [[deps.GeoFormatTypes]] git-tree-sha1 = "7528a7956248c723d01a0a9b0447bf254bf4da52" +registries = "General" uuid = "68eda718-8dee-11e9-39e7-89f7f65f511f" version = "0.4.5" [[deps.GeoInterface]] deps = ["DataAPI", "Extents", "GeoFormatTypes"] git-tree-sha1 = "20f6b13b28c6304104968374f38c24ef71a8ea16" +registries = "General" uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" version = "1.6.2" @@ -418,12 +470,13 @@ version = "1.6.2" [[deps.GeoInterfaceRecipes]] deps = ["GeoInterface", "RecipesBase"] git-tree-sha1 = "69262054e1fdbae2b792ae918100b870952e5251" +registries = "General" uuid = "0329782f-3d07-4b52-b9f6-d3137cf03c7a" version = "1.1.0" [[deps.GhpGhx]] git-tree-sha1 = "b0872962491469f3ae03e130dcd49cca4f19f432" -repo-rev = "fix-ccall-lib-name-julia-113" +repo-rev = "main" repo-url = "https://github.com/NatLabRockies/GhpGhx.jl.git" uuid = "7ce85f02-24a8-4d69-a3f0-14b5daa7d30c" version = "0.1.1" @@ -431,18 +484,21 @@ version = "0.1.1" [[deps.Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] git-tree-sha1 = "a641238db938fff9b2f60d08ed9030387daf428c" +registries = "General" uuid = "a2bd30eb-e257-5431-a919-1863eab51364" version = "1.1.3" [[deps.H5Zblosc]] deps = ["Blosc", "HDF5"] git-tree-sha1 = "d778420e524bcf56066e8c63c7aa315ae7269da2" +registries = "General" uuid = "c8ec2601-a99c-407f-b158-e79c03c2f5f7" version = "0.1.2" [[deps.HDF5]] deps = ["Compat", "HDF5_jll", "Libdl", "MPIPreferences", "Mmap", "Preferences", "Printf", "Random", "Requires", "UUIDs"] git-tree-sha1 = "491ea627ac824619f34168e29a0427a9e00e3e40" +registries = "General" uuid = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" version = "0.17.3" @@ -453,43 +509,50 @@ version = "0.17.3" MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195" [[deps.HDF5_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "38c8874692d48d5440d5752d6c74b0c6b0b60739" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] +git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" +registries = "General" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.2+1" +version = "1.14.3+3" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] git-tree-sha1 = "51059d23c8bb67911a2e6fd5130229113735fc7e" +registries = "General" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" version = "1.11.0" [[deps.HiGHS]] deps = ["HiGHS_jll", "LinearAlgebra", "MathOptIIS", "MathOptInterface", "OpenBLAS32_jll", "PrecompileTools", "SparseArrays"] git-tree-sha1 = "49e52c3ac9237447b602335f1a4a2903f567c1ea" +registries = "General" uuid = "87dc4568-4c63-4d18-b0c0-bb2238e4078b" version = "1.25.3" [[deps.HiGHS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Zlib_jll", "libblastrampoline_jll"] git-tree-sha1 = "d4e63f395d10590fcece8d35005dd7b9a4862635" +registries = "General" uuid = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea" version = "1.15.1+3" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "XML2_jll", "Xorg_libpciaccess_jll"] git-tree-sha1 = "c35847ca5b4997fc8418836354a56c459bcf48d8" +registries = "General" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.14.0+0" [[deps.ImageCore]] deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] git-tree-sha1 = "acf614720ef026d38400b3817614c45882d75500" +registries = "General" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" version = "0.9.4" [[deps.InlineStrings]] git-tree-sha1 = "06b65886c7577a3784d616e29f1302c2e36e389d" +registries = "General" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" version = "1.4.6" @@ -508,6 +571,7 @@ version = "1.11.0" [[deps.IntervalSets]] git-tree-sha1 = "79d6bd28c8d9bccc2229784f1bd637689b256377" +registries = "General" uuid = "8197267c-284f-5f27-9208-e0e47529a953" version = "0.7.14" weakdeps = ["Random", "RecipesBase", "Statistics"] @@ -519,6 +583,7 @@ weakdeps = ["Random", "RecipesBase", "Statistics"] [[deps.InverseFunctions]] git-tree-sha1 = "a779299d77cd080bf77b97535acecd73e1c5e5cb" +registries = "General" uuid = "3587e190-3f89-42d0-90ee-14403ec27112" version = "0.1.17" weakdeps = ["Dates", "Test"] @@ -529,57 +594,67 @@ weakdeps = ["Dates", "Test"] [[deps.InvertedIndices]] git-tree-sha1 = "6da3c4316095de0f5ee2ebd875df8721e7e0bdbe" +registries = "General" uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" version = "1.3.1" [[deps.Ipopt_jll]] deps = ["ASL_jll", "Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "MUMPS_seq_jll", "SPRAL_jll", "libblastrampoline_jll"] git-tree-sha1 = "0e144b24f0cfa8c5bfefcfdbdaae76132597394b" +registries = "General" uuid = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7" version = "300.1400.2000+1" [[deps.IrrationalConstants]] git-tree-sha1 = "b2d91fe939cae05960e760110b328288867b5758" +registries = "General" uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" version = "0.2.6" [[deps.IterTools]] git-tree-sha1 = "42d5f897009e7ff2cf88db414a389e5ed1bdd023" +registries = "General" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" version = "1.10.0" [[deps.IteratorInterfaceExtensions]] git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" +registries = "General" uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[deps.JLD]] deps = ["Compat", "FileIO", "H5Zblosc", "HDF5", "Printf"] git-tree-sha1 = "e42f32690d41f758e126a48ee43459ef91179d1f" +registries = "General" uuid = "4138dd39-2aa7-5051-a626-17a0bb65d9c8" version = "0.13.5" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] git-tree-sha1 = "7204148362dafe5fe6a273f855b8ccbe4df8173e" +registries = "General" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" version = "1.8.0" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a" +registries = "General" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.4" [[deps.JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "037babc10853eeb8e585418922246cb97b8e5b74" +registries = "General" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" version = "3.2.0+1" [[deps.JuMP]] deps = ["LinearAlgebra", "MacroTools", "MathOptInterface", "MutableArithmetics", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays"] git-tree-sha1 = "4f27b21df3b47e8c08a83ead049afb621b2f5b3c" +registries = "General" uuid = "4076af6c-e467-56ae-b986-b466b2749572" version = "1.31.2" @@ -589,20 +664,21 @@ version = "1.31.2" [deps.JuMP.weakdeps] DimensionalData = "0703355e-b756-11e9-17c0-8b28908087d0" +[[deps.JuliaSyntaxHighlighting]] +deps = ["StyledStrings"] +uuid = "ac6e5ff7-fb65-4e79-a425-ec3bc9c03011" +version = "1.12.0" + [[deps.LERC_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434" +registries = "General" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" version = "3.0.0+1" -[[deps.LLVMOpenMP_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "e5b100780d4d30d63b4618d7930d48af409c1772" -uuid = "1d63c593-3942-5779-bab2-d838dc0a180e" -version = "23.1.1+0" - [[deps.LRUCache]] git-tree-sha1 = "5519b95a490ff5fe629c4a7aa3b3dfc9160498b3" +registries = "General" uuid = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637" version = "1.6.2" weakdeps = ["Serialization"] @@ -612,6 +688,7 @@ weakdeps = ["Serialization"] [[deps.LaTeXStrings]] git-tree-sha1 = "f88f3ccef05a6a72a0cf0ed417c8fd68530f4ab2" +registries = "General" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" version = "1.4.1" @@ -623,27 +700,27 @@ version = "1.11.0" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" -version = "0.6.4" +version = "1.0.0" [[deps.LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "Zstd_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.6.0+0" +version = "8.18.0+1" [[deps.LibGit2]] -deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"] +deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" version = "1.11.0" [[deps.LibGit2_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.7.2+0" +version = "1.9.1+0" [[deps.LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "OpenSSL_jll", "Zlib_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.0+1" +version = "1.11.103+0" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -652,35 +729,40 @@ version = "1.11.0" [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "be484f5c92fad0bd8acfef35fe017900b0b73809" +registries = "General" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" version = "1.18.0+0" [[deps.Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "3eb79b0ca5764d4799c06699573fd8f533259713" +registries = "General" uuid = "89763e89-9b03-5906-acba-b20f662cd828" version = "4.4.0+0" [[deps.LinDistFlow]] deps = ["JuMP", "LinearAlgebra", "Logging", "SparseArrays"] git-tree-sha1 = "ad15878e716a18b82325cacc02af4533bb9777e7" +registries = "General" uuid = "bf674bac-ffe4-48d3-9f32-72124ffa9ede" version = "0.1.4" [[deps.LinearAlgebra]] deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -version = "1.11.0" +version = "1.13.0" [[deps.LittleCMS_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg"] git-tree-sha1 = "110897e7db2d6836be22c18bffd9422218ee6284" +registries = "General" uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f" version = "2.12.0+0" [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] git-tree-sha1 = "bba2d9aa057d8f126415de240573e86a8f39d2a1" +registries = "General" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" version = "1.0.1" @@ -701,74 +783,85 @@ version = "1.11.0" [[deps.LoggingExtras]] deps = ["Dates", "Logging"] git-tree-sha1 = "f00544d95982ea270145636c181ceda21c4e2575" +registries = "General" uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36" version = "1.2.0" [[deps.Lz4_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "191686b1ac1ea9c89fc52e996ad15d1d241d1e33" +registries = "General" uuid = "5ced341a-0733-55b8-9ab6-a4889d929147" version = "1.10.1+0" [[deps.METIS_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "2eefa8baa858871ae7770c98c3c2a7e46daba5b4" +registries = "General" uuid = "d00139f3-1899-568f-a2f0-47f597d42d70" version = "5.1.3+0" [[deps.MPFR_jll]] -deps = ["Artifacts", "GMP_jll", "Libdl"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "GMP_jll", "Libdl"] uuid = "3a97d323-0669-5f0c-9066-3539efd106a3" -version = "4.2.1+0" +version = "4.2.2+0" [[deps.MPICH_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "MPIPreferences", "TOML"] git-tree-sha1 = "07dbec8aab01696edc0151a401a6cdfe95b9b885" +registries = "General" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" version = "5.0.1+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] git-tree-sha1 = "8e98d5d80b87403c311fd51e8455d4546ba7a5f8" +registries = "General" uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" version = "0.1.12" [[deps.MPItrampoline_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] git-tree-sha1 = "675df097f8eeb28998b2cfe3b25655af73d5f7df" +registries = "General" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" version = "5.5.6+0" [[deps.MUMPS_seq_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "METIS_jll", "libblastrampoline_jll"] git-tree-sha1 = "fc1daa0ab5a0d7a0a34d5168a711cbf02b2cb0cc" +registries = "General" uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d" version = "500.900.100+0" [[deps.MacroTools]] git-tree-sha1 = "1e0228a030642014fe5cfe68c2c0a818f9e3f522" +registries = "General" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.16" [[deps.MappedArrays]] git-tree-sha1 = "0ee4497a4e80dbd29c058fcee6493f5219556f40" +registries = "General" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" version = "0.4.3" [[deps.Markdown]] -deps = ["Base64"] +deps = ["Base64", "JuliaSyntaxHighlighting", "StyledStrings"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" version = "1.11.0" [[deps.MathOptIIS]] deps = ["MathOptInterface"] git-tree-sha1 = "3b3d69130d8ab8c39d5fa4d30e20a8e6428c9d37" +registries = "General" uuid = "8c4f8055-bd93-4160-a86b-a0c04941dbff" version = "0.2.0" [[deps.MathOptInterface]] deps = ["CodecBzip2", "CodecZlib", "ForwardDiff", "JSON", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"] git-tree-sha1 = "d10ba577e0b5a0481fab01dfd31fb20af3326954" +registries = "General" uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" version = "1.53.0" @@ -783,23 +876,28 @@ version = "1.53.0" [[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] git-tree-sha1 = "8785729fa736197687541f7053f6d8ab7fc44f92" +registries = "General" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" version = "1.1.10" [[deps.MbedTLS_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ff69a2b1330bcb730b9ac1ab7dd680176f5896b8" +registries = "General" uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.6+0" +version = "2.28.1010+0" [[deps.MicrosoftMPI_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "bc95bf4149bf535c09602e3acdf950d9b4376227" +registries = "General" uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf" version = "10.1.4+3" [[deps.Missings]] deps = ["DataAPI"] git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d" +registries = "General" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" version = "1.2.0" @@ -810,37 +908,42 @@ version = "1.11.0" [[deps.MosaicViews]] deps = ["MappedArrays", "OffsetArrays", "PaddedViews", "StackViews"] git-tree-sha1 = "7b86a5d4d70a9f5cdf2dacb3cbe6d251d1a61dbe" +registries = "General" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" version = "0.3.4" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -version = "2023.12.12" +version = "2026.8.13" [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] git-tree-sha1 = "dc5b2c4c111c46bc79ac4405eeb563523b39c004" +registries = "General" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" version = "1.8.0" [[deps.NaNMath]] deps = ["OpenLibm_jll"] git-tree-sha1 = "dbd2e8cd2c1c27f0b584f6661b4309609c5a685e" +registries = "General" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "1.1.4" [[deps.Ncurses_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "095850bc2a585bb20cad8d8f6f9f643d11b49a3d" +registries = "General" uuid = "68e3532b-a499-55ff-9963-d1c0c0748b3a" version = "6.6.0+2" [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" -version = "1.2.0" +version = "1.3.0" [[deps.OffsetArrays]] git-tree-sha1 = "117432e406b5c023f665fa73dc26e79ec3630151" +registries = "General" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" version = "1.17.0" @@ -853,82 +956,96 @@ version = "1.17.0" [[deps.OpenBLAS32_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"] git-tree-sha1 = "30870d0f2dc0b2dba76b10df1c58c7f018413e56" +registries = "General" uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2" version = "0.3.34+0" [[deps.OpenBLAS_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" -version = "0.3.27+1" +version = "0.3.30+0" [[deps.OpenJpeg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "Pkg", "libpng_jll"] git-tree-sha1 = "76374b6e7f632c130e78100b166e5a48464256f8" +registries = "General" uuid = "643b3616-a352-519d-856d-80112ee9badc" version = "2.4.0+0" [[deps.OpenLibm_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -version = "0.8.1+2" +version = "0.8.7+0" [[deps.OpenMPI_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"] -git-tree-sha1 = "6d6c0ca4824268c1a7dca1f4721c535ac63d9074" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"] +git-tree-sha1 = "f63b507960445b8639de5053fedda55af3ffb41f" +registries = "General" uuid = "fe0851c0-eecd-5654-98d4-656369965a5c" -version = "5.0.11+0" +version = "4.1.9+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"] git-tree-sha1 = "1d1aaa7d449b58415f97d2839c318b70ffb525a0" +registries = "General" uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" version = "1.6.1" [[deps.OpenSSL_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "7787087cbc5ec110986e94d9aa1f17639a79c5de" +deps = ["Artifacts", "Libdl"] uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.5.8+0" +version = "3.5.6+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"] git-tree-sha1 = "1346c9208249809840c91b26703912dff463d335" +registries = "General" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.6+0" [[deps.OrderedCollections]] git-tree-sha1 = "05f45c2e0de6259db764adbfd2f1dc6d3f8de13c" +registries = "General" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "2.0.1" [[deps.Osi_jll]] deps = ["Artifacts", "CoinUtils_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"] git-tree-sha1 = "e2316ca10132567419b6d600fd8b4077ee531d69" +registries = "General" uuid = "7da25872-d9ce-5375-a4d3-7a845f58efdd" version = "0.10800.1200+1" +[[deps.PCRE2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" +version = "10.46.0+0" + [[deps.PROJ_jll]] deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "Pkg", "SQLite_jll"] git-tree-sha1 = "fcb3f39ae1184a056ecc415863d46d2109aa6947" +registries = "General" uuid = "58948b4f-47e0-5654-a9ad-f609743f8632" version = "900.100.0+0" [[deps.PaddedViews]] deps = ["OffsetArrays"] git-tree-sha1 = "0fac6313486baae819364c52b4f483450a9d793f" +registries = "General" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" version = "0.5.12" [[deps.Parsers]] deps = ["Dates", "PrecompileTools", "UUIDs"] git-tree-sha1 = "ba0dc8a8a67cacac4842631f960c046e4e563675" +registries = "General" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "2.8.8" [[deps.Pkg]] -deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"] +deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "Zstd_jll", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -version = "1.11.0" +version = "1.13.0" weakdeps = ["REPL"] [deps.Pkg.extensions] @@ -937,24 +1054,28 @@ weakdeps = ["REPL"] [[deps.PooledArrays]] deps = ["DataAPI", "Future"] git-tree-sha1 = "36d8b4b899628fb92c2749eb488d884a926614d3" +registries = "General" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "1.4.3" [[deps.PrecompileTools]] deps = ["Preferences"] -git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f" +git-tree-sha1 = "edbeefc7a4889f528644251bdb5fc9ab5348bc2c" +registries = "General" uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a" -version = "1.2.1" +version = "1.3.4" [[deps.Preferences]] deps = ["TOML"] git-tree-sha1 = "5005266de4bfe50e53ff44a5cb5c540b6e47a254" +registries = "General" uuid = "21216c6a-2e73-6563-6e65-726566657250" version = "1.6.0" [[deps.PrettyTables]] deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"] git-tree-sha1 = "1b8aa19f229b1cea7fc93874a52e49db6a854450" +registries = "General" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" version = "3.4.8" @@ -972,13 +1093,14 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" version = "1.11.0" [[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] +deps = ["Base64", "Dates", "FileWatching", "InteractiveUtils", "JuliaSyntaxHighlighting", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] git-tree-sha1 = "57012c263c02d4d1362b4e248accbe3974e17c74" +registries = "General" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.61.1" @@ -989,35 +1111,41 @@ version = "1.11.0" [[deps.RangeArrays]] git-tree-sha1 = "b9039e93773ddcfc828f12aadf7115b4b4d225f5" +registries = "General" uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" version = "0.3.2" [[deps.Readline_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ncurses_jll"] git-tree-sha1 = "5d26d91800500cd67d4743cdbb59749e46ed726b" +registries = "General" uuid = "05236dd9-4125-5232-aa7c-9ec0c9b2c25a" version = "8.3.3+0" [[deps.RecipesBase]] deps = ["PrecompileTools"] git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff" +registries = "General" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "1.3.4" [[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" +registries = "General" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.2.2" [[deps.Requires]] deps = ["UUIDs"] git-tree-sha1 = "62389eeff14780bfe55195b7204c0d8738436d64" +registries = "General" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.1" [[deps.Roots]] deps = ["Accessors", "CommonSolve", "Printf"] git-tree-sha1 = "3eff988b9bd09543783e2e051b0a1eef11f65c2d" +registries = "General" uuid = "f2b01f46-fcfa-551c-844a-d8ac1e96c665" version = "2.3.0" @@ -1040,40 +1168,46 @@ version = "2.3.0" [[deps.SCIP]] deps = ["Libdl", "LinearAlgebra", "MathOptInterface", "OpenBLAS32_jll", "SCIP_PaPILO_jll", "SCIP_jll"] git-tree-sha1 = "cfc4a317a683a8cd368bde015791055ddd09b9bd" +registries = "General" uuid = "82193955-e24f-5292-bf16-6f2c5261a85f" version = "0.12.8" [[deps.SCIP_PaPILO_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "GMP_jll", "Ipopt_jll", "JLLWrappers", "Libdl", "MPFR_jll", "OpenBLAS32_jll", "Readline_jll", "Zlib_jll", "bliss_jll", "boost_jll", "oneTBB_jll"] git-tree-sha1 = "26d0bb9092bc1e0185598496414282e0d4d16869" +registries = "General" uuid = "fc9abe76-a5e6-5fed-b0b7-a12f309cf031" version = "1000.0.301+0" [[deps.SCIP_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "GMP_jll", "Ipopt_jll", "JLLWrappers", "Libdl", "MPFR_jll", "Readline_jll", "Zlib_jll", "boost_jll"] git-tree-sha1 = "7f0dbabfccaea18076c829c561d462183f7f2b8e" +registries = "General" uuid = "e5ac4fe4-a920-5659-9bf8-f9f73e9e79ce" version = "1000.0.301+0" [[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -version = "0.7.0" +version = "1.0.0" [[deps.SPRAL_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "METIS_jll", "libblastrampoline_jll"] git-tree-sha1 = "b78d602475715c9c6ea21c9650fa5dba58e9945b" +registries = "General" uuid = "319450e9-13b8-58e8-aa9f-8fd1420848ab" version = "2025.9.18+1" [[deps.SQLite_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "9a325057cdb9b066f1f96dc77218df60fe3007cb" +registries = "General" uuid = "76ed43ae-9a5d-5a62-8c75-30186b810ce8" version = "3.48.0+0" [[deps.SentinelArrays]] deps = ["Dates", "Random"] git-tree-sha1 = "084c47c7c5ce5cfecefa0a98dff69eb3646b5a80" +registries = "General" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" version = "1.4.10" @@ -1083,6 +1217,7 @@ version = "1.11.0" [[deps.SimpleBufferStream]] git-tree-sha1 = "f305871d2f381d21527c770d4788c06c097c9bc1" +registries = "General" uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" version = "1.2.0" @@ -1093,17 +1228,19 @@ version = "1.11.0" [[deps.SortingAlgorithms]] deps = ["DataStructures"] git-tree-sha1 = "13cd91cc9be159e3f4d95b857fa2aa383b53772a" +registries = "General" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" version = "1.2.3" [[deps.SparseArrays]] deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -version = "1.11.0" +version = "1.13.0" [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] git-tree-sha1 = "429071b23f4c9a13fb6582f807cc2ef454082408" +registries = "General" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" version = "2.9.0" @@ -1116,17 +1253,20 @@ version = "2.9.0" [[deps.StackViews]] deps = ["OffsetArrays"] git-tree-sha1 = "be1cf4eb0ac528d96f5115b4ed80c26a8d8ae621" +registries = "General" uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15" version = "0.1.2" [[deps.StaticArraysCore]] git-tree-sha1 = "6ab403037779dae8c514bad259f32a447262455a" +registries = "General" uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" version = "1.4.4" [[deps.Statistics]] deps = ["LinearAlgebra"] git-tree-sha1 = "e2b53ce13a53367e96601081e33d34746b571bad" +registries = "General" uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" version = "1.11.5" weakdeps = ["SparseArrays"] @@ -1137,6 +1277,7 @@ weakdeps = ["SparseArrays"] [[deps.StringManipulation]] deps = ["PrecompileTools"] git-tree-sha1 = "773065c6e0e903924a9d838259be74338422aef2" +registries = "General" uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e" version = "0.5.0" @@ -1145,9 +1286,9 @@ uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b" version = "1.11.0" [[deps.SuiteSparse_jll]] -deps = ["Artifacts", "Libdl", "libblastrampoline_jll"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "libblastrampoline_jll"] uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c" -version = "7.7.0+0" +version = "7.10.1+0" [[deps.TOML]] deps = ["Dates"] @@ -1157,12 +1298,14 @@ version = "1.0.3" [[deps.TableTraits]] deps = ["IteratorInterfaceExtensions"] git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" +registries = "General" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" version = "1.0.1" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "OrderedCollections", "TableTraits"] git-tree-sha1 = "a94d9bdda1b7bed0046cea645639ab3f62196fac" +registries = "General" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" version = "1.14.0" @@ -1174,6 +1317,7 @@ version = "1.10.0" [[deps.TensorCore]] deps = ["LinearAlgebra"] git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6" +registries = "General" uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50" version = "0.1.1" @@ -1185,16 +1329,19 @@ version = "1.11.0" [[deps.TestEnv]] deps = ["Pkg"] git-tree-sha1 = "1caf5cc94b2159567af1e50037d7e77024ba3537" +registries = "General" uuid = "1e6cf692-eddd-4d53-88a5-2d735e33781b" version = "1.103.7" [[deps.TranscodingStreams]] git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742" +registries = "General" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" version = "0.11.3" [[deps.URIs]] git-tree-sha1 = "908fec9df6c5de98548ead82a468c95ccf6cd263" +registries = "General" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" version = "1.7.0" @@ -1210,6 +1357,7 @@ version = "1.11.0" [[deps.Unitful]] deps = ["Dates", "LinearAlgebra", "Random"] git-tree-sha1 = "1f0f9f401753701a7e4113b5056ca38d33875b55" +registries = "General" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" version = "1.29.0" @@ -1233,90 +1381,104 @@ version = "1.29.0" [[deps.WeakRefStrings]] deps = ["DataAPI", "InlineStrings", "Parsers"] git-tree-sha1 = "0716e01c3b40413de5dedbc9c5c69f27cddfddfc" +registries = "General" uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" version = "1.4.3" [[deps.WorkerUtilities]] git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7" +registries = "General" uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60" version = "1.6.1" [[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"] git-tree-sha1 = "80d3930c6347cfce7ccf96bd3bafdf079d9c0390" +registries = "General" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" version = "2.13.9+0" [[deps.Xorg_libpciaccess_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "58972370b81423fc546c56a60ed1a009450177c3" +registries = "General" uuid = "a65dc6b1-eb27-53a1-bb3e-dea574b5389e" version = "0.19.0+0" [[deps.Xpress]] deps = ["Libdl", "MathOptInterface"] git-tree-sha1 = "fb15c53e88cd8fd1f97b3b17103f05c44ed22076" +registries = "General" uuid = "9e70acf3-d6c9-5be6-b5bd-4e2c73e3e054" version = "0.18.2" [[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.13+1" +version = "1.3.1+2" [[deps.Zstd_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "446b23e73536f84e8037f5dce465e92275f6a308" +deps = ["CompilerSupportLibraries_jll", "Libdl"] uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" version = "1.5.7+1" [[deps.bliss_jll]] deps = ["Artifacts", "GMP_jll", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "f8b75e896a326a162a4f6e998990521d8302c810" +registries = "General" uuid = "508c9074-7a14-5c94-9582-3d4bc1871065" version = "0.77.0+1" [[deps.boost_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "25fb6ecbb784a45f8ea74584fa631a9e85393dd0" +registries = "General" uuid = "28df3c45-c428-5900-9ff8-a3135698ca75" version = "1.87.0+0" [[deps.libaec_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "60f4792734488db6f42e2c7699f1d4594780bd03" +registries = "General" uuid = "477f73a3-ac25-53e9-8cc3-50b2fa2566f0" version = "1.1.7+0" [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -version = "5.11.0+0" +version = "5.15.0+0" [[deps.libgeotiff_jll]] deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "PROJ_jll", "Pkg"] git-tree-sha1 = "13dfba87a1fe301c4b40f991d0ec990bbee59bbe" +registries = "General" uuid = "06c338fa-64ff-565b-ac2f-249532af990e" version = "100.700.100+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "e51150d5ab85cee6fc36726850f0e627ad2e4aba" +registries = "General" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" version = "1.6.58+0" [[deps.nghttp2_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -version = "1.59.0+0" +version = "1.67.1+0" [[deps.oneTBB_jll]] deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] git-tree-sha1 = "da8c1f6eee04831f14edcfa5dae611d309807e57" +registries = "General" uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" version = "2022.3.0+0" [[deps.p7zip_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -version = "17.4.0+2" +version = "17.8.2+0" + +[registries.General] +url = "https://github.com/JuliaRegistries/General.git" +uuid = "23338594-aafe-5451-b93e-139f81909106" diff --git a/julia_src/Project.toml b/julia_src/Project.toml index 890902eae..1d10c6d02 100644 --- a/julia_src/Project.toml +++ b/julia_src/Project.toml @@ -15,8 +15,9 @@ SCIP = "82193955-e24f-5292-bf16-6f2c5261a85f" SQLite_jll = "76ed43ae-9a5d-5a62-8c75-30186b810ce8" Xpress = "9e70acf3-d6c9-5be6-b5bd-4e2c73e3e054" +[sources] +GhpGhx = {rev = "main", url = "https://github.com/NatLabRockies/GhpGhx.jl.git"} + [compat] PROJ_jll = "900.0.0" -# SQLite_jll >= 3.51 ships SONAME libsqlite3.so.3.x, but PROJ_jll 900.x links -# against libsqlite3.so.0, so newer versions break PROJ/GDAL/ArchGDAL at dlopen. SQLite_jll = "~3.48" From 74e4f114e32140e73c7638ef05626392f9c5448f Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 14 Sep 2026 16:50:27 -0600 Subject: [PATCH 09/23] Temp update REopt.jl to julia-113 version --- julia_src/Manifest.toml | 5 +++-- julia_src/Project.toml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 64260c37f..5c379688e 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -1099,8 +1099,9 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "57012c263c02d4d1362b4e248accbe3974e17c74" -registries = "General" +git-tree-sha1 = "83fe56ee7480ce9f1549713be2efd34e9a8b6cea" +repo-rev = "julia-113" +repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.61.1" diff --git a/julia_src/Project.toml b/julia_src/Project.toml index 1d10c6d02..25db24e4f 100644 --- a/julia_src/Project.toml +++ b/julia_src/Project.toml @@ -17,6 +17,7 @@ Xpress = "9e70acf3-d6c9-5be6-b5bd-4e2c73e3e054" [sources] GhpGhx = {rev = "main", url = "https://github.com/NatLabRockies/GhpGhx.jl.git"} +REopt = {rev = "julia-113", url = "https://github.com/NatLabRockies/REopt.jl.git"} [compat] PROJ_jll = "900.0.0" From 01b466723ac72e8c4884c60112f41e82644a6125 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 14 Sep 2026 17:26:38 -0600 Subject: [PATCH 10/23] Unpin PROJ_jll so it works on Julia 1.13 The julia_src environment pinned PROJ_jll = "900.0.0" as a direct dependency. On Julia 1.13 that build fails to load: InitError: could not load library ".../lib/libproj.so" libcurl.so.4: version `CURL_4' not found (required by libproj.so) PROJ_jll 900.100.0 requires versioned CURL_4 symbols that the libcurl bundled with Julia 1.13 does not export. Because PROJ_jll was pinned here directly, this environment kept resolving the broken build even after REopt.jl relaxed its own ArchGDAL bound. Move the bound to PROJ_jll = "902", which resolves: ArchGDAL 0.9.4 -> 0.10.12 GDAL_jll 300.500.101+0 -> 304.1200.300+0 PROJ_jll 900.100.0+0 -> 902.800.100+0 SQLite_jll 3.48.0+0 -> 3.53.4+0 Also drop the SQLite_jll = "~3.48" pin. That pin existed only because PROJ_jll 900.x records `DT_NEEDED libsqlite3.so.0` and SQLite_jll >= 3.51 changed its SONAME. SQLite_jll 3.53.4 still installs a libsqlite3.so.0 symlink alongside libsqlite3.so.3.53.4, and the 902.x libproj loads against it cleanly, so the constraint is no longer needed. Verified in the julia:1.13.0 image from a clean depot: `using REopt` and `using GhpGhx` succeed, find_ashrae_zone_city(39.7, -105.2) returns "Boulder", avert_region_abbreviation(...) returns ("RM", 0.0), and a full `docker build` of julia_src/Dockerfile completes through precompile.jl. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- julia_src/Manifest.toml | 334 +++++++++++++++++++++++++++++----------- julia_src/Project.toml | 6 +- 2 files changed, 248 insertions(+), 92 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 5c379688e..ea77822c1 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.13.0" manifest_format = "2.1" -project_hash = "fc22894309b8f27c983e7be2f1d0fefc50982e9f" +project_hash = "fbf4b82ecac1c2433add2711a6cd18c1182598f2" [[deps.ASL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -11,21 +11,6 @@ registries = "General" uuid = "ae81ac8f-d209-56e5-92de-9978fef736f9" version = "0.1.5+0" -[[deps.AbstractFFTs]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "d92ad398961a3ed262d8bf04a1a2b8340f915fef" -registries = "General" -uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.5.0" - - [deps.AbstractFFTs.extensions] - AbstractFFTsChainRulesCoreExt = "ChainRulesCore" - AbstractFFTsTestExt = "Test" - - [deps.AbstractFFTs.weakdeps] - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - [[deps.Accessors]] deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"] git-tree-sha1 = "7063ad1083578215c7c4bf410368150abe8d5524" @@ -52,16 +37,33 @@ version = "0.1.45" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" [[deps.ArchGDAL]] -deps = ["CEnum", "ColorTypes", "Dates", "DiskArrays", "Extents", "GDAL", "GDAL_jll", "GeoFormatTypes", "GeoInterface", "GeoInterfaceRecipes", "ImageCore", "Tables"] -git-tree-sha1 = "edfaf8e5f8d57cabcd98399b0b727bce22bb4d9c" +deps = ["CEnum", "ColorTypes", "Dates", "DiskArrays", "Extents", "GDAL", "GeoFormatTypes", "GeoInterface", "ImageCore", "Tables"] +git-tree-sha1 = "d77f9c3d7bc0df0c7d197bc68a78a39664f1523d" registries = "General" uuid = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3" -version = "0.9.4" +version = "0.10.12" + + [deps.ArchGDAL.extensions] + ArchGDALJLD2Ext = "JLD2" + ArchGDALMakieExt = "Makie" + ArchGDALRecipesBaseExt = "RecipesBase" + + [deps.ArchGDAL.weakdeps] + JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" + Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" + RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" [[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" version = "1.1.2" +[[deps.Arrow_jll]] +deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Lz4_jll", "Thrift_jll", "Zlib_jll", "Zstd_jll", "boost_jll", "brotli_jll", "snappy_jll"] +git-tree-sha1 = "55ecf3d16295c26e96d2f0b65386d1a8414e2283" +registries = "General" +uuid = "8ce61222-c28f-5041-a97a-c2198fb817bf" +version = "19.0.1+0" + [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" version = "1.11.0" @@ -105,10 +107,10 @@ uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" version = "1.0.9+0" [[deps.CEnum]] -git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90" +git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" registries = "General" uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" -version = "0.4.2" +version = "0.5.0" [[deps.CSV]] deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"] @@ -168,24 +170,32 @@ version = "200.1100.1300+1" [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "b10d0b65641d57b8b4d5e234446582de5047050d" +git-tree-sha1 = "67e11ee83a43eb71ddc950302c53bf33f0690dfe" registries = "General" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.11.5" +version = "0.12.1" +weakdeps = ["StyledStrings"] + + [deps.ColorTypes.extensions] + StyledStringsExt = "StyledStrings" [[deps.ColorVectorSpace]] -deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"] -git-tree-sha1 = "600cc5508d66b78aae350f7accdb58763ac18589" +deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "Requires", "Statistics", "TensorCore"] +git-tree-sha1 = "8b3b6f87ce8f65a2b4f857528fd8d70086cd72b1" registries = "General" uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" -version = "0.9.10" +version = "0.11.0" +weakdeps = ["SpecialFunctions"] + + [deps.ColorVectorSpace.extensions] + SpecialFunctionsExt = "SpecialFunctions" [[deps.Colors]] deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] -git-tree-sha1 = "362a287c3aa50601b0bc359053d5c2468f0e7ce0" +git-tree-sha1 = "37ea44092930b1811e666c3bc38065d7d87fcc74" registries = "General" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.11" +version = "0.13.1" [[deps.CommonSolve]] deps = ["PrecompileTools"] @@ -323,11 +333,11 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.16.0" [[deps.DiskArrays]] -deps = ["LRUCache", "OffsetArrays"] -git-tree-sha1 = "ef25c513cad08d7ebbed158c91768ae32f308336" +deps = ["ConstructionBase", "LRUCache", "Mmap", "OffsetArrays"] +git-tree-sha1 = "9903195c34a488c5265d9a105f39718b7a2b3568" registries = "General" uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3" -version = "0.3.23" +version = "0.4.22" [[deps.DocStringExtensions]] git-tree-sha1 = "7442a5dfe1ebb773c29cc2962a8980f47221d76c" @@ -421,24 +431,24 @@ version = "1.11.0" [[deps.GDAL]] deps = ["CEnum", "GDAL_jll", "NetworkOptions", "PROJ_jll"] -git-tree-sha1 = "9ce70502472a9f23f8889f0f9e2be8451413fe7b" +git-tree-sha1 = "3eb19662b42c9d1c707b5ebe636595511c8b453d" registries = "General" uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" -version = "1.4.0" +version = "1.12.0" [[deps.GDAL_jll]] -deps = ["Artifacts", "Expat_jll", "GEOS_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "libgeotiff_jll"] -git-tree-sha1 = "e9604365601f34d669dac3609fa4870803bdea9b" +deps = ["Arrow_jll", "Artifacts", "Blosc_jll", "Expat_jll", "GEOS_jll", "HDF4_jll", "HDF5_jll", "JLLWrappers", "LERC_jll", "LibCURL_jll", "LibPQ_jll", "Libdl", "Libtiff_jll", "Lz4_jll", "NetCDF_jll", "OpenJpeg_jll", "PCRE2_jll", "PROJ_jll", "Qhull_jll", "SQLite_jll", "XML2_jll", "XZ_jll", "Zlib_jll", "Zstd_jll", "libgeotiff_jll", "libpng_jll", "libwebp_jll", "muparser_jll"] +git-tree-sha1 = "310849b52fa1896fe556ca7027d56e32aa3727f1" registries = "General" uuid = "a7073274-a066-55f0-b90d-d619367d196c" -version = "300.500.101+0" +version = "304.1200.300+0" [[deps.GEOS_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "818ab247de98d8848a022c7be084b1283d912326" +git-tree-sha1 = "fdaf62d2354bb398652ee612d487eb19d74468a6" registries = "General" uuid = "d604d12d-fa86-5845-992e-78dc15976526" -version = "3.11.2+0" +version = "3.14.1+0" [[deps.GMP_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] @@ -467,13 +477,6 @@ version = "1.6.2" Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -[[deps.GeoInterfaceRecipes]] -deps = ["GeoInterface", "RecipesBase"] -git-tree-sha1 = "69262054e1fdbae2b792ae918100b870952e5251" -registries = "General" -uuid = "0329782f-3d07-4b52-b9f6-d3137cf03c7a" -version = "1.1.0" - [[deps.GhpGhx]] git-tree-sha1 = "b0872962491469f3ae03e130dcd49cca4f19f432" repo-rev = "main" @@ -481,12 +484,12 @@ repo-url = "https://github.com/NatLabRockies/GhpGhx.jl.git" uuid = "7ce85f02-24a8-4d69-a3f0-14b5daa7d30c" version = "0.1.1" -[[deps.Graphics]] -deps = ["Colors", "LinearAlgebra", "NaNMath"] -git-tree-sha1 = "a641238db938fff9b2f60d08ed9030387daf428c" +[[deps.Giflib_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "6570366d757b50fabae9f4315ad74d2e40c0560a" registries = "General" -uuid = "a2bd30eb-e257-5431-a919-1863eab51364" -version = "1.1.3" +uuid = "59f7168a-df46-5410-90c8-f2779963d0ec" +version = "5.2.3+0" [[deps.H5Zblosc]] deps = ["Blosc", "HDF5"] @@ -495,6 +498,13 @@ registries = "General" uuid = "c8ec2601-a99c-407f-b158-e79c03c2f5f7" version = "0.1.2" +[[deps.HDF4_jll]] +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Zlib_jll", "libaec_jll"] +git-tree-sha1 = "ea9eff9cfef5f45b771096e5c2de3de0eab937c3" +registries = "General" +uuid = "818ab7a1-5177-5f44-ba99-6e845030c6cb" +version = "4.3.2+0" + [[deps.HDF5]] deps = ["Compat", "HDF5_jll", "Libdl", "MPIPreferences", "Mmap", "Preferences", "Printf", "Random", "Requires", "UUIDs"] git-tree-sha1 = "491ea627ac824619f34168e29a0427a9e00e3e40" @@ -510,10 +520,10 @@ version = "0.17.3" [[deps.HDF5_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "OpenSSL_jll", "TOML", "Zlib_jll", "libaec_jll"] -git-tree-sha1 = "82a471768b513dc39e471540fdadc84ff80ff997" +git-tree-sha1 = "e94f84da9af7ce9c6be049e9067e511e17ff89ec" registries = "General" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.14.3+3" +version = "1.14.6+0" [[deps.HTTP]] deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] @@ -543,12 +553,19 @@ registries = "General" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.14.0+0" +[[deps.ICU_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "b3d8be712fbf9237935bde0ce9b5a736ae38fc34" +registries = "General" +uuid = "a51ab1cf-af8e-5615-a023-bc2c838bba6b" +version = "76.2.0+0" + [[deps.ImageCore]] -deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "acf614720ef026d38400b3817614c45882d75500" +deps = ["ColorVectorSpace", "Colors", "FixedPointNumbers", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "PrecompileTools", "Reexport"] +git-tree-sha1 = "8c193230235bbcee22c8066b0374f63b5683c2d3" registries = "General" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.9.4" +version = "0.10.5" [[deps.InlineStrings]] git-tree-sha1 = "06b65886c7577a3784d616e29f1302c2e36e389d" @@ -574,13 +591,17 @@ git-tree-sha1 = "79d6bd28c8d9bccc2229784f1bd637689b256377" registries = "General" uuid = "8197267c-284f-5f27-9208-e0e47529a953" version = "0.7.14" -weakdeps = ["Random", "RecipesBase", "Statistics"] [deps.IntervalSets.extensions] IntervalSetsRandomExt = "Random" IntervalSetsRecipesBaseExt = "RecipesBase" IntervalSetsStatisticsExt = "Statistics" + [deps.IntervalSets.weakdeps] + Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" + RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" + Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + [[deps.InverseFunctions]] git-tree-sha1 = "a779299d77cd080bf77b97535acecd73e1c5e5cb" registries = "General" @@ -669,12 +690,26 @@ deps = ["StyledStrings"] uuid = "ac6e5ff7-fb65-4e79-a425-ec3bc9c03011" version = "1.12.0" +[[deps.Kerberos_krb5_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "0f2899fdadaab4b8f57db558ba21bdb4fb52f1f0" +registries = "General" +uuid = "b39eb1a6-c29a-53d7-8c32-632cd16f18da" +version = "1.21.3+0" + [[deps.LERC_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434" +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "39bca05343661c347aae0bca57a5994a0bf4f08d" registries = "General" uuid = "88015f11-f218-50d7-93a8-a6af411a945d" -version = "3.0.0+1" +version = "4.2.0+0" + +[[deps.LLVMOpenMP_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "e5b100780d4d30d63b4618d7930d48af409c1772" +registries = "General" +uuid = "1d63c593-3942-5779-bab2-d838dc0a180e" +version = "23.1.1+0" [[deps.LRUCache]] git-tree-sha1 = "5519b95a490ff5fe629c4a7aa3b3dfc9160498b3" @@ -717,6 +752,13 @@ deps = ["Artifacts", "CompilerSupportLibraries_jll", "LibSSH2_jll", "Libdl", "Op uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" version = "1.9.1+0" +[[deps.LibPQ_jll]] +deps = ["Artifacts", "ICU_jll", "JLLWrappers", "Kerberos_krb5_jll", "Libdl", "OpenSSL_jll", "Zstd_jll"] +git-tree-sha1 = "c692057e05ba6da348bc45d5dab8c7a2c88da518" +registries = "General" +uuid = "08be9ffa-1c94-5ee5-a977-46a84ec9b350" +version = "16.14.0+0" + [[deps.LibSSH2_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "OpenSSL_jll", "Zlib_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" @@ -726,6 +768,13 @@ version = "1.11.103+0" uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" version = "1.11.0" +[[deps.Libglvnd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll", "Xorg_libXext_jll"] +git-tree-sha1 = "d36c21b9e7c172a44a10484125024495e2625ac0" +registries = "General" +uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29" +version = "1.7.1+1" + [[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "be484f5c92fad0bd8acfef35fe017900b0b73809" @@ -734,11 +783,11 @@ uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" version = "1.18.0+0" [[deps.Libtiff_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "3eb79b0ca5764d4799c06699573fd8f533259713" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "aebd334d06cee9f24cea70bd19a39749daf73881" registries = "General" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.4.0+0" +version = "4.7.3+0" [[deps.LinDistFlow]] deps = ["JuMP", "LinearAlgebra", "Logging", "SparseArrays"] @@ -753,11 +802,11 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" version = "1.13.0" [[deps.LittleCMS_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg"] -git-tree-sha1 = "110897e7db2d6836be22c18bffd9422218ee6284" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll"] +git-tree-sha1 = "38928f7999753af13d4e13966ae15958ff3a917a" registries = "General" uuid = "d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f" -version = "2.12.0+0" +version = "2.19.1+0" [[deps.LogExpFunctions]] deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] @@ -807,11 +856,11 @@ uuid = "3a97d323-0669-5f0c-9066-3539efd106a3" version = "4.2.2+0" [[deps.MPICH_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "07dbec8aab01696edc0151a401a6cdfe95b9b885" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "9341048b9f723f2ae2a72a5269ac2f15f80534dc" registries = "General" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "5.0.1+0" +version = "4.3.2+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] @@ -937,6 +986,13 @@ registries = "General" uuid = "68e3532b-a499-55ff-9963-d1c0c0748b3a" version = "6.6.0+2" +[[deps.NetCDF_jll]] +deps = ["Artifacts", "Blosc_jll", "Bzip2_jll", "HDF5_jll", "JLLWrappers", "LazyArtifacts", "LibCURL_jll", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "TOML", "XML2_jll", "Zlib_jll", "Zstd_jll", "libaec_jll", "libzip_jll"] +git-tree-sha1 = "d574803b6055116af212434460adf654ce98e345" +registries = "General" +uuid = "7243133f-43d8-5620-bbf4-c2c921802cf3" +version = "401.900.300+0" + [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.3.0" @@ -966,11 +1022,11 @@ uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" version = "0.3.30+0" [[deps.OpenJpeg_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "Pkg", "libpng_jll"] -git-tree-sha1 = "76374b6e7f632c130e78100b166e5a48464256f8" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libtiff_jll", "LittleCMS_jll", "libpng_jll"] +git-tree-sha1 = "215a6666fee6d6b3a6e75f2cc22cb767e2dd393a" registries = "General" uuid = "643b3616-a352-519d-856d-80112ee9badc" -version = "2.4.0+0" +version = "2.5.5+0" [[deps.OpenLibm_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] @@ -978,11 +1034,11 @@ uuid = "05823500-19ac-5b8b-9628-191a04bc5112" version = "0.8.7+0" [[deps.OpenMPI_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"] -git-tree-sha1 = "f63b507960445b8639de5053fedda55af3ffb41f" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"] +git-tree-sha1 = "6d6c0ca4824268c1a7dca1f4721c535ac63d9074" registries = "General" uuid = "fe0851c0-eecd-5654-98d4-656369965a5c" -version = "4.1.9+0" +version = "5.0.11+0" [[deps.OpenSSL]] deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"] @@ -1022,11 +1078,11 @@ uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" version = "10.46.0+0" [[deps.PROJ_jll]] -deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "Pkg", "SQLite_jll"] -git-tree-sha1 = "fcb3f39ae1184a056ecc415863d46d2109aa6947" +deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "SQLite_jll"] +git-tree-sha1 = "fbfbc14815c5f5375abc971321aa5f468e715a38" registries = "General" uuid = "58948b4f-47e0-5654-a9ad-f609743f8632" -version = "900.100.0+0" +version = "902.800.100+0" [[deps.PaddedViews]] deps = ["OffsetArrays"] @@ -1092,6 +1148,13 @@ deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" version = "1.11.0" +[[deps.Qhull_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "c69da20496799bbdd56c15ecf5d80a5e6cbcc904" +registries = "General" +uuid = "784f63db-0788-585a-bace-daefebcd302b" +version = "10008.0.1004+0" + [[deps.REPL]] deps = ["Base64", "Dates", "FileWatching", "InteractiveUtils", "JuliaSyntaxHighlighting", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" @@ -1123,13 +1186,6 @@ registries = "General" uuid = "05236dd9-4125-5232-aa7c-9ec0c9b2c25a" version = "8.3.3+0" -[[deps.RecipesBase]] -deps = ["PrecompileTools"] -git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff" -registries = "General" -uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.3.4" - [[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" registries = "General" @@ -1199,11 +1255,11 @@ uuid = "319450e9-13b8-58e8-aa9f-8fd1420848ab" version = "2025.9.18+1" [[deps.SQLite_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] -git-tree-sha1 = "9a325057cdb9b066f1f96dc77218df60fe3007cb" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll", "dlfcn_win32_jll"] +git-tree-sha1 = "1ccd7f7235fe700bfb57dd6dd9984cce08f517d2" registries = "General" uuid = "76ed43ae-9a5d-5a62-8c75-30186b810ce8" -version = "3.48.0+0" +version = "3.53.4+0" [[deps.SentinelArrays]] deps = ["Dates", "Random"] @@ -1334,6 +1390,13 @@ registries = "General" uuid = "1e6cf692-eddd-4d53-88a5-2d735e33781b" version = "1.103.7" +[[deps.Thrift_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "boost_jll"] +git-tree-sha1 = "4d16a4b4eab80099c19342b10d0bdb252c39bea6" +registries = "General" +uuid = "e0b8ae26-5307-5830-91fd-398402328850" +version = "0.21.1+0" + [[deps.TranscodingStreams]] git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742" registries = "General" @@ -1399,6 +1462,41 @@ registries = "General" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" version = "2.13.9+0" +[[deps.XZ_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "e52eca002a11c30a858185efdfb15311e1c7a6bf" +registries = "General" +uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800" +version = "5.8.4+0" + +[[deps.Xorg_libX11_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] +git-tree-sha1 = "808090ede1d41644447dd5cbafced4731c56bd2f" +registries = "General" +uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" +version = "1.8.13+0" + +[[deps.Xorg_libXau_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "aa1261ebbac3ccc8d16558ae6799524c450ed16b" +registries = "General" +uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" +version = "1.0.13+0" + +[[deps.Xorg_libXdmcp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "52858d64353db33a56e13c341d7bf44cd0d7b309" +registries = "General" +uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" +version = "1.1.6+0" + +[[deps.Xorg_libXext_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libX11_jll"] +git-tree-sha1 = "1a4a26870bf1e5d26cd585e38038d399d7e65706" +registries = "General" +uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" +version = "1.3.8+0" + [[deps.Xorg_libpciaccess_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] git-tree-sha1 = "58972370b81423fc546c56a60ed1a009450177c3" @@ -1406,6 +1504,20 @@ registries = "General" uuid = "a65dc6b1-eb27-53a1-bb3e-dea574b5389e" version = "0.19.0+0" +[[deps.Xorg_libxcb_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libXau_jll", "Xorg_libXdmcp_jll"] +git-tree-sha1 = "bfcaf7ec088eaba362093393fe11aa141fa15422" +registries = "General" +uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" +version = "1.17.1+0" + +[[deps.Xorg_xtrans_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "a63799ff68005991f9d9491b6e95bd3478d783cb" +registries = "General" +uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" +version = "1.6.0+0" + [[deps.Xpress]] deps = ["Libdl", "MathOptInterface"] git-tree-sha1 = "fb15c53e88cd8fd1f97b3b17103f05c44ed22076" @@ -1437,6 +1549,20 @@ registries = "General" uuid = "28df3c45-c428-5900-9ff8-a3135698ca75" version = "1.87.0+0" +[[deps.brotli_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "46fda47f4215c957bc92fd5fbb5ad04fee1e3743" +registries = "General" +uuid = "4611771a-a7d2-5e23-8d00-b1becdba1aae" +version = "1.2.0+0" + +[[deps.dlfcn_win32_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "e141d67ffe550eadfb5af1bdbdaf138031e4805f" +registries = "General" +uuid = "c4b69c83-5512-53e3-94e6-de98773c479f" +version = "1.4.2+0" + [[deps.libaec_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "60f4792734488db6f42e2c7699f1d4594780bd03" @@ -1450,11 +1576,11 @@ uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" version = "5.15.0+0" [[deps.libgeotiff_jll]] -deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "PROJ_jll", "Pkg"] -git-tree-sha1 = "13dfba87a1fe301c4b40f991d0ec990bbee59bbe" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LibCURL_jll", "Libdl", "Libtiff_jll", "PROJ_jll", "Zlib_jll"] +git-tree-sha1 = "cbdbc9ae1127f81cb653a4f7545d89f8db2a17a7" registries = "General" uuid = "06c338fa-64ff-565b-ac2f-249532af990e" -version = "100.700.100+0" +version = "100.702.400+0" [[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"] @@ -1463,6 +1589,27 @@ registries = "General" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" version = "1.6.58+0" +[[deps.libwebp_jll]] +deps = ["Artifacts", "Giflib_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libglvnd_jll", "Libtiff_jll", "libpng_jll"] +git-tree-sha1 = "4e4282c4d846e11dce56d74fa8040130b7a95cb3" +registries = "General" +uuid = "c5f90fcd-3b7e-5836-afba-fc50a0988cb2" +version = "1.6.0+0" + +[[deps.libzip_jll]] +deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "OpenSSL_jll", "XZ_jll", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "363a1c43b8cb92e7b3ff7f504ef9a0a83c548e97" +registries = "General" +uuid = "337d8026-41b4-5cde-a456-74a10e5b31d1" +version = "1.11.4+0" + +[[deps.muparser_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LLVMOpenMP_jll", "Libdl"] +git-tree-sha1 = "70ee0f42a44ef6e16298e5bfc8b6e311d08e49bb" +registries = "General" +uuid = "888e69b1-873b-5047-a2fc-24c07cbe9dc8" +version = "2.3.5+0" + [[deps.nghttp2_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" @@ -1480,6 +1627,13 @@ deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" version = "17.8.2+0" +[[deps.snappy_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ca88363dd41d2547f52118287dd34dbbc14f3eb7" +registries = "General" +uuid = "fe1e1685-f7be-5f59-ac9f-4ca204017dfd" +version = "1.2.3+0" + [registries.General] url = "https://github.com/JuliaRegistries/General.git" uuid = "23338594-aafe-5451-b93e-139f81909106" diff --git a/julia_src/Project.toml b/julia_src/Project.toml index 25db24e4f..b68939310 100644 --- a/julia_src/Project.toml +++ b/julia_src/Project.toml @@ -20,5 +20,7 @@ GhpGhx = {rev = "main", url = "https://github.com/NatLabRockies/GhpGhx.jl.git"} REopt = {rev = "julia-113", url = "https://github.com/NatLabRockies/REopt.jl.git"} [compat] -PROJ_jll = "900.0.0" -SQLite_jll = "~3.48" +# PROJ_jll 900.x required pinning SQLite_jll to ~3.48 (SONAME libsqlite3.so.0) +# and broke on Julia 1.13 (libproj.so needs CURL_4, absent from the bundled +# libcurl.so.4). PROJ_jll 902.x links both correctly, so neither pin is needed. +PROJ_jll = "902" From e8237503a1a2a35d0136da0c656ea44c195fa082 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Wed, 16 Sep 2026 12:55:40 -0400 Subject: [PATCH 11/23] Adjust ElectricStorage defaults Update the default ElectricStorage O&M cost fraction from 0.025 to 0.04 per 2025 ATB defaults update and add a migration that enforces validation bounds for om_cost_fraction_of_installed_cost and size_class. --- ...ost_fraction_of_installed_cost_and_more.py | 24 +++++++++++++++++++ reoptjl/models.py | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 reoptjl/migrations/0127_alter_electricstorageinputs_om_cost_fraction_of_installed_cost_and_more.py diff --git a/reoptjl/migrations/0127_alter_electricstorageinputs_om_cost_fraction_of_installed_cost_and_more.py b/reoptjl/migrations/0127_alter_electricstorageinputs_om_cost_fraction_of_installed_cost_and_more.py new file mode 100644 index 000000000..9a539aa62 --- /dev/null +++ b/reoptjl/migrations/0127_alter_electricstorageinputs_om_cost_fraction_of_installed_cost_and_more.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.26 on 2026-09-16 16:54 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0126_electricstorageinputs_size_class_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='electricstorageinputs', + name='om_cost_fraction_of_installed_cost', + field=models.FloatField(blank=True, default=0.04, help_text='Annual O&M cost as a fraction of installed cost.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1.0)]), + ), + migrations.AlterField( + model_name='electricstorageinputs', + name='size_class', + field=models.IntegerField(blank=True, help_text='ElectricStorage size class. Must be an integer value between 1 and 4. Default is calculated per ratio of annual peak and average load of given load profile.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + ), + ] diff --git a/reoptjl/models.py b/reoptjl/models.py index a71cd7d31..82e94f85c 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -3902,7 +3902,7 @@ class ElectricStorageInputs(BaseModel, models.Model): help_text="Number of years from start of analysis period to apply replace_cost_constant." ) om_cost_fraction_of_installed_cost = models.FloatField( - default=0.025, + default=0.04, validators=[ MinValueValidator(0), MaxValueValidator(1.0) From c938ab8f7a74abd1794211c8e7bddf88f1cadd82 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Wed, 16 Sep 2026 12:13:22 -0600 Subject: [PATCH 12/23] Update to latest REopt.jl#julia-113 --- julia_src/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index ea77822c1..82ee02f7d 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -1162,7 +1162,7 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "83fe56ee7480ce9f1549713be2efd34e9a8b6cea" +git-tree-sha1 = "36ff6f22759034e7b9fa7b24454074f2ad412b2a" repo-rev = "julia-113" repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" From 12ea53a9c1b9f1bf850d750485358d1236330bc3 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:33:15 -0600 Subject: [PATCH 13/23] Add URDB_API_KEY to .env file --- julia_src/.env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/julia_src/.env b/julia_src/.env index e181af83e..c19f7883a 100644 --- a/julia_src/.env +++ b/julia_src/.env @@ -1,2 +1,3 @@ NLR_DEVELOPER_API_KEY="gAfosXcQ9Ldfw3qXqvKVb7PxMEkYigozmC9R3mXQ" -NLR_DEVELOPER_EMAIL="reopt@nlr.gov" \ No newline at end of file +NLR_DEVELOPER_EMAIL="reopt@nlr.gov" +URDB_API_KEY = "lU1FMjXuKmxIEMedkwxPIc7MsICSqecdRrTqheOJ" \ No newline at end of file From f5d86a8121095d3f20180a461ed84214c8872b19 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:33:43 -0600 Subject: [PATCH 14/23] Update REopt.jl to master branch (unregistered) --- julia_src/Manifest.toml | 4 ++-- julia_src/Project.toml | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 82ee02f7d..0bca49269 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -1162,8 +1162,8 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "36ff6f22759034e7b9fa7b24454074f2ad412b2a" -repo-rev = "julia-113" +git-tree-sha1 = "47899f0b64832265411b718fea39249f69ca80c8" +repo-rev = "master" repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.61.1" diff --git a/julia_src/Project.toml b/julia_src/Project.toml index b68939310..406723801 100644 --- a/julia_src/Project.toml +++ b/julia_src/Project.toml @@ -17,10 +17,7 @@ Xpress = "9e70acf3-d6c9-5be6-b5bd-4e2c73e3e054" [sources] GhpGhx = {rev = "main", url = "https://github.com/NatLabRockies/GhpGhx.jl.git"} -REopt = {rev = "julia-113", url = "https://github.com/NatLabRockies/REopt.jl.git"} +REopt = {rev = "master", url = "https://github.com/NatLabRockies/REopt.jl.git"} [compat] -# PROJ_jll 900.x required pinning SQLite_jll to ~3.48 (SONAME libsqlite3.so.0) -# and broke on Julia 1.13 (libproj.so needs CURL_4, absent from the bundled -# libcurl.so.4). PROJ_jll 902.x links both correctly, so neither pin is needed. PROJ_jll = "902" From 98b0b8cb9d95db2db88343100af3d777a48957ef Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Thu, 17 Sep 2026 14:38:52 -0600 Subject: [PATCH 15/23] Update CHP supplementary firing inputs/outputs for REopt.jl PR 626 Rename supplementary_firing_capital_cost_per_kw to supplementary_firing_installed_cost_per_mmbtu_per_hour and supplementary_firing_max_steam_ratio to supplementary_firing_max_ratio in CHPInputs. Rename size_supplemental_firing_kw to size_supplemental_firing_mmbtu_per_hour and add size_supplementary_firing_ratio and annual_supplementary_firing_thermal_production_mmbtu to CHPOutputs. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 11 ++++ ...upplementary_firing_chp_fields_and_more.py | 52 +++++++++++++++++++ reoptjl/models.py | 30 ++++++++--- 3 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py diff --git a/CHANGELOG.md b/CHANGELOG.md index fb9f0135e..dfe75c990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,17 @@ Classify the change according to the following categories: ##### Removed ### Patches +## Develop - 2026-09-17 +### Minor Updates +##### Changed +- `reoptjl/models.py`: Renamed **CHPInputs.supplementary_firing_capital_cost_per_kw** to **CHPInputs.supplementary_firing_installed_cost_per_mmbtu_per_hour** [$/MMBtu/hr of incremental thermal capacity, default 10000.0], to match the updated REopt.jl input +- `reoptjl/models.py`: Renamed **CHPInputs.supplementary_firing_max_steam_ratio** to **CHPInputs.supplementary_firing_max_ratio**, now defined as the ratio of max fired steam capacity relative to the steam generated by the CHP system running at rated capacity +- `reoptjl/models.py`: Renamed **CHPOutputs.size_supplemental_firing_kw** to **CHPOutputs.size_supplemental_firing_mmbtu_per_hour**, which is now the incremental thermal capacity of the supplementary firing system [MMBtu/hr] instead of an electric capacity [kW] +##### Added +- `reoptjl/models.py`: Added **CHPOutputs.size_supplementary_firing_ratio**, the ratio of total fired thermal capacity (unfired + supplementary firing) to unfired CHP thermal capacity at full load +- `reoptjl/models.py`: Added **CHPOutputs.annual_supplementary_firing_thermal_production_mmbtu**, the annual supplementary firing thermal production [MMBtu] +- `reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py`: Migration for the CHP supplementary firing input/output renames and new outputs + ## v3.23.0 ### Minor Updates ##### Changed diff --git a/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py b/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py new file mode 100644 index 000000000..47a67b5f7 --- /dev/null +++ b/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py @@ -0,0 +1,52 @@ +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0125_chpoutputs_annual_thermal_curtailed_mmbtu_and_more'), + ] + + operations = [ + migrations.RenameField( + model_name='chpinputs', + old_name='supplementary_firing_capital_cost_per_kw', + new_name='supplementary_firing_installed_cost_per_mmbtu_per_hour', + ), + migrations.RenameField( + model_name='chpinputs', + old_name='supplementary_firing_max_steam_ratio', + new_name='supplementary_firing_max_ratio', + ), + migrations.RenameField( + model_name='chpoutputs', + old_name='size_supplemental_firing_kw', + new_name='size_supplemental_firing_mmbtu_per_hour', + ), + migrations.AlterField( + model_name='chpinputs', + name='supplementary_firing_installed_cost_per_mmbtu_per_hour', + field=models.FloatField(blank=True, default=10000.0, help_text='Installed CHP supplementary firing system cost in $/MMBtu/hr of incremental thermal capacity', null=True, validators=[django.core.validators.MinValueValidator(0.0), django.core.validators.MaxValueValidator(10000000.0)]), + ), + migrations.AlterField( + model_name='chpinputs', + name='supplementary_firing_max_ratio', + field=models.FloatField(blank=True, default=1.0, help_text='Ratio of max fired steam capacity relative to the steam generated by the CHP system when running at rated capacity. Relevant only for combustion_turbine prime_mover', null=True, validators=[django.core.validators.MinValueValidator(0.0), django.core.validators.MaxValueValidator(10.0)]), + ), + migrations.AlterField( + model_name='chpoutputs', + name='size_supplemental_firing_mmbtu_per_hour', + field=models.FloatField(blank=True, help_text='Incremental thermal capacity of the CHP supplementary firing system [MMBtu/hr]', null=True), + ), + migrations.AddField( + model_name='chpoutputs', + name='size_supplementary_firing_ratio', + field=models.FloatField(blank=True, help_text='Ratio of total fired thermal capacity (unfired + supplementary firing) to unfired CHP thermal capacity at full load [-]', null=True), + ), + migrations.AddField( + model_name='chpoutputs', + name='annual_supplementary_firing_thermal_production_mmbtu', + field=models.FloatField(blank=True, help_text='Supplementary firing thermal energy produced in a year [MMBtu]', null=True), + ), + ] diff --git a/reoptjl/models.py b/reoptjl/models.py index 32f69e66d..5e5b26173 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -4642,17 +4642,17 @@ class CHPInputs(BaseModel, models.Model): blank=True, help_text="Maximum rate of change in electric production per hour as a fraction of size_kw [kW/size_kw/hour]." ) - supplementary_firing_capital_cost_per_kw = models.FloatField( - default=150, + supplementary_firing_installed_cost_per_mmbtu_per_hour = models.FloatField( + default=10000.0, validators=[ MinValueValidator(0.0), - MaxValueValidator(1.0e5) + MaxValueValidator(1.0e7) ], null=True, blank=True, - help_text="Installed CHP supplementary firing system cost in $/kWe" + help_text="Installed CHP supplementary firing system cost in $/MMBtu/hr of incremental thermal capacity" ) - supplementary_firing_max_steam_ratio = models.FloatField( + supplementary_firing_max_ratio = models.FloatField( default=1.0, validators=[ MinValueValidator(0.0), @@ -4660,7 +4660,10 @@ class CHPInputs(BaseModel, models.Model): ], null=True, blank=True, - help_text="Ratio of max fired steam to un-fired steam production. Relevant only for combustion_turbine prime_mover" + help_text=( + "Ratio of max fired steam capacity relative to the steam generated by the CHP system when running at " + "rated capacity. Relevant only for combustion_turbine prime_mover" + ) ) supplementary_firing_efficiency =models.FloatField( default=0.92, @@ -5049,9 +5052,20 @@ class CHPOutputs(BaseModel, models.Model): null=True, blank=True, help_text="Power capacity size of the existing CHP system in BAU [kW]" ) - size_supplemental_firing_kw = models.FloatField( + size_supplemental_firing_mmbtu_per_hour = models.FloatField( + null=True, blank=True, + help_text="Incremental thermal capacity of the CHP supplementary firing system [MMBtu/hr]" + ) + size_supplementary_firing_ratio = models.FloatField( + null=True, blank=True, + help_text=( + "Ratio of total fired thermal capacity (unfired + supplementary firing) to unfired CHP thermal " + "capacity at full load [-]" + ) + ) + annual_supplementary_firing_thermal_production_mmbtu = models.FloatField( null=True, blank=True, - help_text="Power capacity of CHP supplementary firing system [kW]" + help_text="Supplementary firing thermal energy produced in a year [MMBtu]" ) annual_fuel_consumption_mmbtu = models.FloatField( null=True, blank=True, From 0a12bd54591c8b0e629a41549a06857145db522d Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Thu, 17 Sep 2026 18:26:11 -0600 Subject: [PATCH 16/23] Update to latest REopt#master after supplementary firing merge --- julia_src/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 0bca49269..c20201201 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -1162,7 +1162,7 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "47899f0b64832265411b718fea39249f69ca80c8" +git-tree-sha1 = "3b6e0f448f36e5e0d118181e0d5914a88c2d3016" repo-rev = "master" repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" From 041c79a8afca588c51fa45aa2e58879ead99369e Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Fri, 18 Sep 2026 11:11:20 -0600 Subject: [PATCH 17/23] Update default value for supplementary_firing_installed_cost_per_mmbtu_per_hour, just update migration don't add one --- .../0126_rename_supplementary_firing_chp_fields_and_more.py | 2 +- reoptjl/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py b/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py index 47a67b5f7..07f903225 100644 --- a/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py +++ b/reoptjl/migrations/0126_rename_supplementary_firing_chp_fields_and_more.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='chpinputs', name='supplementary_firing_installed_cost_per_mmbtu_per_hour', - field=models.FloatField(blank=True, default=10000.0, help_text='Installed CHP supplementary firing system cost in $/MMBtu/hr of incremental thermal capacity', null=True, validators=[django.core.validators.MinValueValidator(0.0), django.core.validators.MaxValueValidator(10000000.0)]), + field=models.FloatField(blank=True, default=20000.0, help_text='Installed CHP supplementary firing system cost in $/MMBtu/hr of incremental thermal capacity', null=True, validators=[django.core.validators.MinValueValidator(0.0), django.core.validators.MaxValueValidator(10000000.0)]), ), migrations.AlterField( model_name='chpinputs', diff --git a/reoptjl/models.py b/reoptjl/models.py index 5e5b26173..b5e064ced 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -4643,7 +4643,7 @@ class CHPInputs(BaseModel, models.Model): help_text="Maximum rate of change in electric production per hour as a fraction of size_kw [kW/size_kw/hour]." ) supplementary_firing_installed_cost_per_mmbtu_per_hour = models.FloatField( - default=10000.0, + default=20000.0, validators=[ MinValueValidator(0.0), MaxValueValidator(1.0e7) From 076ca9db10672a54fc564285b3991d0a685f6ddc Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Mon, 21 Sep 2026 11:20:47 -0400 Subject: [PATCH 18/23] Update test_job_endpoint.py bug fix --- reoptjl/test/test_job_endpoint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reoptjl/test/test_job_endpoint.py b/reoptjl/test/test_job_endpoint.py index 7bfde5225..f3e3022a0 100644 --- a/reoptjl/test/test_job_endpoint.py +++ b/reoptjl/test/test_job_endpoint.py @@ -462,4 +462,4 @@ def test_electric_storage_cost_defaults_update_from_julia(self): r = json.loads(resp.content) self.assertEqual(r["inputs"]["ElectricStorage"]["size_class"], 1) - self.assertAlmostEqual(r["inputs"]["PV"]["installed_cost_per_kw"], 705) \ No newline at end of file + self.assertAlmostEqual(r["inputs"]["ElectricStorage"]["installed_cost_per_kw"], 705) \ No newline at end of file From d6b00f4013273eba6255f69a921f58ea9a631762 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Mon, 21 Sep 2026 12:35:45 -0400 Subject: [PATCH 19/23] update wind cost defaults per ATB2025 --- .../0128_alter_windinputs_om_cost_per_kw.py | 19 +++++++++++++++++++ reoptjl/models.py | 10 +++++----- 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 reoptjl/migrations/0128_alter_windinputs_om_cost_per_kw.py diff --git a/reoptjl/migrations/0128_alter_windinputs_om_cost_per_kw.py b/reoptjl/migrations/0128_alter_windinputs_om_cost_per_kw.py new file mode 100644 index 000000000..824b085f2 --- /dev/null +++ b/reoptjl/migrations/0128_alter_windinputs_om_cost_per_kw.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.26 on 2026-09-21 16:34 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0127_alter_electricstorageinputs_om_cost_fraction_of_installed_cost_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='windinputs', + name='om_cost_per_kw', + field=models.FloatField(blank=True, default=43, help_text='Annual operations and maintenance costs in $/kW', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(1000.0)]), + ), + ] diff --git a/reoptjl/models.py b/reoptjl/models.py index 82e94f85c..33900daf0 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -76,10 +76,10 @@ class MACRS_YEARS_CHOICES(models.IntegerChoices): } WIND_COST_DEFAULTS = { # size_class_to_installed_cost - "residential" : 7692.0, - "commercial" : 5776.0, - "medium" : 3807.0, - "large" : 2896.0 + "residential" : 8960.0, + "commercial" : 6782.0, + "medium" : 4368.0, + "large" : 3477.0 } def at_least_one_set(model, possible_sets): @@ -3411,7 +3411,7 @@ class WIND_SIZE_CLASS_CHOICES(models.TextChoices): help_text="Installed cost in $/kW. Default cost is determined based on size_class." ) om_cost_per_kw = models.FloatField( - default=42, + default=43, validators=[ MinValueValidator(0), MaxValueValidator(1.0e3) From 88801991fcf5922136566687031eac74ca3ebb9d Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Mon, 21 Sep 2026 14:48:00 -0400 Subject: [PATCH 20/23] bug fix and update stale manifest --- julia_src/Manifest.toml | 2 +- reoptjl/test/test_http_endpoints.py | 14 +++++++++++++- reoptjl/test/test_validator.py | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index c49793b98..2c333ddc1 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -966,7 +966,7 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "cbd0675c03f309a4a8bf4ff8048783d2c9c59f79" +git-tree-sha1 = "e832e7f582a3fc467cdb9494eaaf16eed9e7e4e8" repo-rev = "electric_storage_size_class" repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" diff --git a/reoptjl/test/test_http_endpoints.py b/reoptjl/test/test_http_endpoints.py index 07a70ae56..db3597a3f 100644 --- a/reoptjl/test/test_http_endpoints.py +++ b/reoptjl/test/test_http_endpoints.py @@ -539,6 +539,18 @@ def test_pv_cost_defaults(self): resp = self.api_client.get(f'/v3/pv_cost_defaults', data=inputs_dict) view_response = json.loads(resp.content) - self.assertEqual(view_response["size_class"], 3) + self.assertEqual(view_response["size_class"], 3) + + def test_electric_storage_cost_defaults(self): + inputs_dict = { + "electric_load_annual_peak": 8760000.0, + "electric_load_average": 8760 + } + + # Call to the django view endpoint /get_electric_storage_defaults which calls the http.jl endpoint + resp = self.api_client.get(f'/v3/electric_storage_cost_defaults', data=inputs_dict) + view_response = json.loads(resp.content) + + self.assertEqual(view_response["size_class"], 4) diff --git a/reoptjl/test/test_validator.py b/reoptjl/test/test_validator.py index 7465fb94b..12f98a063 100644 --- a/reoptjl/test/test_validator.py +++ b/reoptjl/test/test_validator.py @@ -102,7 +102,7 @@ def test_off_grid_defaults_overrides(self): self.assertAlmostEqual(validator.models["Wind"].operating_reserve_required_fraction, 0.5) self.assertAlmostEqual(validator.models["PV"].operating_reserve_required_fraction, 0.25) - self.assertEqual(validator.models["Wind"].installed_cost_per_kw, 5776.0) # set based on size_class (commercial) + self.assertEqual(validator.models["Wind"].installed_cost_per_kw, 6782.0) # set based on size_class (commercial) self.assertAlmostEqual(validator.models["ElectricLoad"].operating_reserve_required_fraction, 0.1) self.assertAlmostEqual(validator.models["ElectricLoad"].critical_load_fraction, 1.0) From e5010177bc7ec39205d79ab71edf33993e032e37 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 21 Sep 2026 22:41:55 -0600 Subject: [PATCH 21/23] Merge migrations after merging bess-size-class --- reoptjl/migrations/0129_merge_20260922_0441.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 reoptjl/migrations/0129_merge_20260922_0441.py diff --git a/reoptjl/migrations/0129_merge_20260922_0441.py b/reoptjl/migrations/0129_merge_20260922_0441.py new file mode 100644 index 000000000..590e89433 --- /dev/null +++ b/reoptjl/migrations/0129_merge_20260922_0441.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.26 on 2026-09-22 04:41 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('reoptjl', '0126_rename_supplementary_firing_chp_fields_and_more'), + ('reoptjl', '0128_alter_windinputs_om_cost_per_kw'), + ] + + operations = [ + ] From 5ecc1d9470f01d2311c2b335e48f27058f6dd623 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Tue, 22 Sep 2026 13:51:55 -0400 Subject: [PATCH 22/23] return all bess size class parameters --- julia_src/Manifest.toml | 2 +- julia_src/http.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 2c333ddc1..4ddbe58fb 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -966,7 +966,7 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "e832e7f582a3fc467cdb9494eaaf16eed9e7e4e8" +git-tree-sha1 = "a1e6fee498f2b4d4c35f45e35dce3063aaee6139" repo-rev = "electric_storage_size_class" repo-url = "https://github.com/NatLabRockies/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" diff --git a/julia_src/http.jl b/julia_src/http.jl index 4548fabbb..cadf25c59 100644 --- a/julia_src/http.jl +++ b/julia_src/http.jl @@ -902,7 +902,7 @@ function electric_storage_cost_defaults(req::HTTP.Request) data = Dict() error_response = Dict() try - data["installed_cost_per_kw"], data["installed_cost_per_kwh"], data["installed_cost_constant"], data["size_class"], data["size_kw_for_size_class"] = reoptjl.get_electric_storage_cost_params(; + data["installed_cost_per_kw"], data["installed_cost_per_kwh"], data["installed_cost_constant"], data["size_class"], data["size_kw_for_size_class"], data["electric_load_based_sizing_kw"], data["size_class_bounds_kw"] = reoptjl.get_electric_storage_cost_params(; (Symbol(k) => v for (k, v) in pairs(d))... ) catch e From 1266504b8f854e6d636bb43aea209ad6f16c9385 Mon Sep 17 00:00:00 2001 From: "Rathod, Bhavesh" Date: Tue, 22 Sep 2026 15:44:06 -0400 Subject: [PATCH 23/23] Update test_job_endpoint.py update tests --- reoptjl/test/test_job_endpoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reoptjl/test/test_job_endpoint.py b/reoptjl/test/test_job_endpoint.py index f3e3022a0..6f75875ae 100644 --- a/reoptjl/test/test_job_endpoint.py +++ b/reoptjl/test/test_job_endpoint.py @@ -461,5 +461,5 @@ def test_electric_storage_cost_defaults_update_from_julia(self): resp = self.api_client.get(f'/stable/job/{run_uuid}/results') r = json.loads(resp.content) - self.assertEqual(r["inputs"]["ElectricStorage"]["size_class"], 1) - self.assertAlmostEqual(r["inputs"]["ElectricStorage"]["installed_cost_per_kw"], 705) \ No newline at end of file + self.assertEqual(r["inputs"]["ElectricStorage"]["size_class"], 2) + self.assertAlmostEqual(r["inputs"]["ElectricStorage"]["installed_cost_per_kw"], 676) \ No newline at end of file