Merge Gemini changes #84
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…xed, publications after co-iteration timestep instead of before
nadiavp
reviewed
Oct 28, 2021
nadiavp
reviewed
Oct 28, 2021
PyDSS/helics_interface.py
Outdated
| helics.helicsFederateInfoSetCoreInitString(self.fedinfo, f"--federates=1 --networktimeout=60min --timeout=60min --broker_address {self._options['Helics']['Broker']} --port {self._options['Helics']['Broker port']} --maxsize=32768 --slowresponding") | ||
| helics.helicsFederateInfoSetFlagOption(self.fedinfo, helics.helics_flag_terminate_on_error, 0) # set terminate_on_error to false | ||
| #if 'Broker' in self._options['Helics']: | ||
| # helics.helicsFederateInfoSetBroker(self.fedinfo, self._options['Helics']['Broker']) | ||
| IP = self._settings.helics.broker |
There was a problem hiding this comment.
the broker and port are already set in line 86: helics.helicsFederateInfoSetCoreInitString, so likely don't need the next few lines.
nadiavp
reviewed
Oct 28, 2021
daniel-thom
commented
Oct 28, 2021
daniel-thom
commented
Oct 28, 2021
PyDSS/helics_interface.py
Outdated
| IP = self._settings.helics.broker | ||
| Port = self._settings.helics.broker_port | ||
| self._logger.info("Connecting to broker @ {}".format(f"{IP}:{Port}" if Port else IP)) | ||
| helics.helicsFederateInfoSetCoreInitString(self.fedinfo, f"--federates=1 --networktimeout=60min --timeout=60min --broker_address {self._options['Helics']['Broker']} --port {self._options['Helics']['Broker port']} --maxsize=32768 --slowresponding") |
There was a problem hiding this comment.
@nadiavp This line is actually broken because of the recent changes to the input structures. The original code did not require both broker and broker_port. Do we need to keep that behavior?
daniel-thom
commented
Nov 18, 2021
daniel-thom
commented
Nov 18, 2021
| IP = self._settings.helics.broker | ||
| Port = self._settings.helics.broker_port | ||
| self._logger.info("Connecting to broker @ {}".format(f"{IP}:{Port}" if Port else IP)) | ||
| helics.helicsFederateInfoSetCoreInitString(self.fedinfo, f"--federates=1 --networktimeout=60min --timeout=60min --maxsize=32768 --slowresponding") |
There was a problem hiding this comment.
@AadilLatif Do you have any comments on the changes in this file?
daniel-thom
commented
Nov 18, 2021
daniel-thom
commented
Nov 18, 2021
daniel-thom
commented
Nov 19, 2021
daniel-thom
commented
Nov 19, 2021
| @@ -523,6 +528,11 @@ class HelicsModel(InputsBaseModel): | |||
| default=5, | |||
| alias="Helics logging level", | |||
| ) | |||
| store_intermediate_values: bool = Field( | |||
There was a problem hiding this comment.
@nadiavp @AadilLatif Note this field and default value. Let me know if the default should be flipped.
daniel-thom
commented
Nov 19, 2021
| @@ -71,6 +72,9 @@ def GetValue(self, VarName, convert=False): | |||
| if convert: | |||
| if VarName in self.VARIABLE_OUTPUTS_BY_LIST: | |||
| VarValue = VarValue[:self.NumWindings] | |||
| if len(VarValue) < self.NumWindings: | |||
There was a problem hiding this comment.
@AadilLatif Any objections?
daniel-thom
force-pushed
the
merge-gemini
branch
from
1aa7cf2
to
ac965e6
Compare
… helics prints, request time non-iterative if never converges
|
@AadilLatif This is ready for a final review. You'll want to check the HELICS changes. |
…ward 2 steps at a time, PV objects don't need kvarlimits in dss files
|
@daniel-thom are we still interested in merging this pull request? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a draft pull request to attempt to merge Gemini-required changes into PyDSS master. More fixes are almost certainly required.
@AadilLatif You will want to be aware of this PR. You're welcome to review now or wait until we've removed the draft label.