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

Fixes after PR 14 #15

Merged
3 commits merged into from
Sep 3, 2020
Merged

Fixes after PR 14 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd243da
commented out optimizer portion of outer for now
PaulTalbot-INL Sep 2, 2020
d6f336f
fixed call
PaulTalbot-INL Sep 2, 2020
6fd7d20
Merge branch 'devel' into postmerge_fix
PaulTalbot-INL Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions templates/outer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@
</Grid>
</Samplers>

<Optimizers>
<!-- <Optimizers>
<GradientDescent name="cap_opt">
<objective>mean_NPV</objective>
<!-- <variable> nodes filled by HERON -->
<variable name="x">
<distribution>beale_dist</distribution>
<initial>-2</initial>
Expand Down Expand Up @@ -96,7 +95,7 @@
<gradient>1e-2</gradient>
</convergence>
</GradientDescent>
</Optimizers>
</Optimizers> -->

<Files>
<Input name="inner_workflow" type='raven'>inner.xml</Input>
Expand Down
2 changes: 1 addition & 1 deletion templates/template_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def _modify_inner_sources(self, template, case, components, sources):
# add a step to load the model
self._iostep_load_rom(template, case, components, source)
# add a step to print the rom meta
self._iostep_rom_meta(template, case, components, source)
self._iostep_rom_meta(template, source)
# add the source to the arma-and-dispatch ensemble
self._add_arma_to_ensemble(template, source)
# NOTE assuming input to all ARMAs is "scaling" constant = 1.0, already in MonteCarlo sampler
Expand Down