Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion openconcept/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.2.4"
__version__ = "1.2.5"
18 changes: 14 additions & 4 deletions openconcept/mission/mission_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,21 @@ def _setup_procs(self, *args):
# (This IntegratorGroup is never added directly to the OM model)
time_units = self._oc_time_units
num_nodes = self.options["num_nodes"]
self.add_subsystem(
"ode_integ",
Integrator(time_setup="duration", method="simpson", diff_units=time_units, num_nodes=num_nodes),
)

# In OM 3.40 and later, static_mode is no longer True when this method is called, which leads to any
# subsystems that are added here to later be erased. So here we force static_mode to True while we add the
# Integrator subsystem to get around the issue. See https://github.com/OpenMDAO/OpenMDAO/issues/3621 for
# more details
try:
if self._problem_meta is not None:
self._problem_meta["static_mode"] = True
self.add_subsystem(
"ode_integ",
Integrator(time_setup="duration", method="simpson", diff_units=time_units, num_nodes=num_nodes),
)
finally:
if self._problem_meta is not None:
self._problem_meta["static_mode"] = False
# Call om.Group's _setup_procs which does a lot of things as an initial phase of setup.
# We pass *args because the signature of this method varies depending on the OM version.
super(IntegratorGroup, self)._setup_procs(*args)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
# and the index.rst file in the docs when you change these
"numpy >=1.20, <2",
"scipy>=1.7.0",
"openmdao >=3.21, <=3.39",
"openmdao >=3.21",
],
extras_require={
"testing": ["pytest", "pytest-cov", "coverage", "openaerostruct", "parameterized"],
"testing": ["pytest", "pytest-cov", "coverage", "openaerostruct", "parameterized", "om-pycycle>=4.4.0"],
"docs": ["sphinx_mdolab_theme", "openaerostruct<=2.7.1"],
"plot": ["matplotlib"],
},
Expand Down
Loading