Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Monte Carlo modularization/standardization first pass #116

Merged
merged 32 commits into from
Feb 12, 2024
Merged

Monte Carlo modularization/standardization first pass #116

merged 32 commits into from
Feb 12, 2024

Conversation

softwareengineerprogrammer
Copy link
Collaborator

@softwareengineerprogrammer softwareengineerprogrammer commented Feb 11, 2024 •
edited
Loading

  1. Moves Monte Carlo to its own module geophires_monte_carlo.
  2. Bumps version to 3.4 since this would be a breaking change for any existing Monte Carlo consumers; changelog entry
  3. Adds GeophiresMonteCarloClient for better programmatic consumption
  4. Addresses some existing multi-threading/subprocess issues (some may remain, as marked by various FIXMEs)
  5. Adds basic MC user guide https://softwareengineerprogrammer.github.io/GEOPHIRES-X/Monte-Carlo-User-Guide.html
  1. HIP-RA & Monte Carlo user manual instructions #72 - https://softwareengineerprogrammer.github.io/GEOPHIRES-X/Monte-Carlo-User-Guide.html
  2. Add Monte Carlo & HIP RA instructions to README #69 - https://github.com/softwareengineerprogrammer/GEOPHIRES-X?tab=readme-ov-file#monte-carlo
  3. Previous MC version compatibility shim - deferring this for now, any existing users can see changelog entry

@softwareengineerprogrammer
Ignore default MC output file in src/
4c9c692
@softwareengineerprogrammer
Basic MC_GeoPHIRES3.py formatting
43146bd
@softwareengineerprogrammer
Use tempfile for MC inputs/results to avoid cluttering working direct…
73d565f 
…ory; output pngs to same directory as result file
@softwareengineerprogrammer
Enable fallback calculation in GEOPHIRES use of water properties - NR…
8cbcc99 
…EL#110
@softwareengineerprogrammer
More MC formatting cleanup, set MC example file python path to relati…
f3404bb 
…ve venv
@softwareengineerprogrammer
Fix typo in example1_addons.txt - 'buring'
4fb00d7
@softwareengineerprogrammer
Fix typo in example1_addons.txt - 'buring'
8525d9a
@softwareengineerprogrammer
Move monte carlo to geophires_monte_carlo package
c702db6
@softwareengineerprogrammer
Fix Path.exists check, clean up variable names
6e9e663
@softwareengineerprogrammer
WIP - MC client + unit test
41238d4
@softwareengineerprogrammer
Take output file as optional arg
c93bc36
@softwareengineerprogrammer
Include output file in result
c1e85e8
@softwareengineerprogrammer
Remove redundant print statements, suppress tempfile ResourceWarning
8a3c83d
@softwareengineerprogrammer
Temporarily disable GH Actions fail-fast for debugging
a9ce08a
@softwareengineerprogrammer
Avoid using root logger per https://bubthegreat.medium.com/stop-using…
fe60aef 
…-the-root-logger-in-python-1183bd89f4dd; set level as explained in https://stackoverflow.com/a/72337475/21380804
@softwareengineerprogrammer
If code file is for Geophires, use geophires client instead of subpro…
cb67e0d 
…cess. Fix python <3.11 Path.unlink error.
@softwareengineerprogrammer
HIP-RA MC skeleton - disabled for now because result parsing chokes
597617c
@softwareengineerprogrammer
Ignore tempfile resource warning that's causing windows test to fail
b370a23
@softwareengineerprogrammer
Temporarily disable monte carlo test to investigate windows failure
f85c386
@softwareengineerprogrammer
See if windows failure was due to slash splitting
11dde1b
@softwareengineerprogrammer
Revert "Ignore tempfile resource warning that's causing windows test …
2e9adf0 
…to fail"

This reverts commit b370a23.
@softwareengineerprogrammer
Revert "Temporarily disable GH Actions fail-fast for debugging"
1b59974 
This reverts commit a9ce08a.
@softwareengineerprogrammer
Avoid modifying sys.argv to pass/parse args
ad1e418
@softwareengineerprogrammer
Pass output file from model to Outputs instead of Outputs reading fro…
c7c2b57 
…m sys.argv
@softwareengineerprogrammer
Pass input file name from Model to utils read_input_file (WIP to cons…
347b569 
…olidate/eliminate dependency on sys.argv)
@softwareengineerprogrammer
Merge Monte Carlo standardization
17351a3 
Monte Carlo standardization
@softwareengineerprogrammer
Bump version: 3.3.4 → 3.4.0
b159998
@softwareengineerprogrammer
v3.4 changelog entry
bce3d01
@softwareengineerprogrammer
Merge branch 'NREL:main' into main
721050b
@softwareengineerprogrammer
Fix TDPReservoir.py inputs for documentation generation
9084e06
@softwareengineerprogrammer softwareengineerprogrammer changed the title Monte Carlo modularization/standardization Monte Carlo modularization/standardization first pass Feb 12, 2024
@softwareengineerprogrammer softwareengineerprogrammer marked this pull request as ready for review February 12, 2024 16:11
malcolm-dsider
malcolm-dsider approved these changes Feb 12, 2024
View reviewed changes
Copy link
Collaborator

@malcolm-dsider malcolm-dsider left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A great deal of good work here! I see nothing to change

@softwareengineerprogrammer softwareengineerprogrammer merged commit 74181aa into NREL:main Feb 12, 2024
12 checks passed
This was referenced Feb 12, 2024
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@malcolm-dsider malcolm-dsider malcolm-dsider approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@softwareengineerprogrammer @malcolm-dsider