-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Converting GenX to being a submodule #144
Conversation
Hopefully this'll resolve cloning issues
Lots of small changes to get a MVP. We're including all the necessary GenX code and then overwritting the relevant pieces with DOLPHYN functions. I took this include-based approach because if we include("GenX.jl") and/or using GenX we'll create a module which only exports a few of the functions that we need. We could create a new function which separates the GenX and other pieces, but this keeps all the choices about whether to use GenX or alternative functions in one place
This was just still here to let me compare it to the updated version easily
This should be pushed to GenX if it's useful for all projects
Fixed bugs in write_outputs and TDR for HSC
This allows us to load the DOLPHYN env using "julia --project=." and call "using DOLPHYN" without touching the LOAD_PATH
All GenX files are now included automatically, other than those manually excluded.
We need to remove some unused defaults later
Updated function to recursively find .jl files to not include when including GenX functions. Files can be excluded on a per-file or per-directory basis
Given that I was making some changes, I refreshed the GenX submodule to make sure that all the files were properly included. The examples still work for me, but I'd appreciate if people could test the branch again. I resolved the documentation issue (I had to update the GitHub workflow to use Julia v1.8). This allows me to push with Gurobi included, and it is still the default solver for the examples. Several functions were not included in the documentation. I've divided them into two groups. I'd suggest we merge this PR to main asap and then resolve the documentation issues afterwards. Helper functions which don't need full documentation right now: Model functions which need to be added to the documentation: |
I've just noticed that the documentation is not pulling the GenX functions properly. See here for an example. This may be because the functions are now considered part of the GenX module, not DOLPHYN, so we need to rewrite some of the doc/source files. I'd still recommend that we push this PR so we have a working version of DOLPHYN up, and then we quickly fix all issues with the docs afterwards. |
Here is what I noticed so far in my tests What did I test with genx_as_submodule branch
|
1) made edits to CO2_cap.csv files for number of example systems where inputs were not correct 2) Made some changes to ThreeZone_Liquid file to allow for liquefaction only in one zone to see if it resolve infeasible model issue. Model is still infeasible.
One more thing - we should probably delete the "SelectZones", "TenZones" examples as well as consider deleting the "2030_CombEC_DETrans" if it is outdated. |
|
reduced_main has fewer extraneous files
- Revert to old Truck Routes - Disable Zones feature - Fix examples
This works locally but fails on the GitHub Actions machine. Need to investigate further
This is the second attempt at this. The main details of the changes are in PR #139
This PR builds on PR #139 but includes a more recent version of DOLPHYN and updates some of the examples to ensure they work. The following examples work on my linux system: