made grid_data available right after instantiaton; address issue #246 (…

…#249)
OpenMDAO · Oct 25, 2019 · 9aa819e · 9aa819e
1 parent 11fe4ba
commit 9aa819e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/dymos/phase/phase.py b/dymos/phase/phase.py
@@ -1255,8 +1255,6 @@ def setup(self):
 
         transcription = self.options['transcription']
 
-        transcription.setup_grid(self)
-
         transcription.setup_time(self)
 
         # The control interpolation comp to which we'll connect controls

diff --git a/dymos/transcriptions/pseudospectral/gauss_lobatto.py b/dymos/transcriptions/pseudospectral/gauss_lobatto.py
@@ -24,7 +24,7 @@ class GaussLobatto(PseudospectralBase):
     High-Order Gauss-Lobatto Quadrature Rules." Journal of Guidance, Control, and
     Dynamics 19.3 (1996): 592-599.
     """
-    def setup_grid(self, phase):
+    def init_grid(self):
         self.grid_data = GridData(num_segments=self.options['num_segments'],
                                   transcription='gauss-lobatto',
                                   transcription_order=self.options['order'],
@@ -447,7 +447,6 @@ def setup_timeseries_outputs(self, phase):
             if options['transcription'] is None:
                 ogd = None
             else:
-                options['transcription'].setup_grid(phase)
                 ogd = options['transcription'].grid_data
 
             timeseries_comp = PseudospectralTimeseriesOutputComp(input_grid_data=gd,

diff --git a/dymos/transcriptions/pseudospectral/radau_pseudospectral.py b/dymos/transcriptions/pseudospectral/radau_pseudospectral.py
@@ -23,7 +23,7 @@ class Radau(PseudospectralBase):
     Control Problems Using a Radau Pseudospectral Method." American Institute of Aeronautics
     and Astronautics, 2009.
     """
-    def setup_grid(self, phase):
+    def init_grid(self):
         self.grid_data = GridData(num_segments=self.options['num_segments'],
                                   transcription='radau-ps',
                                   transcription_order=self.options['order'],
@@ -309,7 +309,6 @@ def setup_timeseries_outputs(self, phase):
             if options['transcription'] is None:
                 ogd = None
             else:
-                options['transcription'].setup_grid(phase)
                 ogd = options['transcription'].grid_data
 
             timeseries_comp = PseudospectralTimeseriesOutputComp(input_grid_data=gd,

diff --git a/dymos/transcriptions/runge_kutta/runge_kutta.py b/dymos/transcriptions/runge_kutta/runge_kutta.py
@@ -38,7 +38,7 @@ def initialize(self):
                              desc='The options passed to the nonlinear solver used to converge the'
                                   'Runge-Kutta propagation across each step.')
 
-    def setup_grid(self, phase):
+    def init_grid(self):
         self.grid_data = GridData(num_segments=self.options['num_segments'],
                                   transcription='runge-kutta',
                                   transcription_order=self.options['method'],
@@ -685,7 +685,6 @@ def setup_timeseries_outputs(self, phase):
             if options['transcription'] is None:
                 ogd = None
             else:
-                options['transcription'].setup_grid(phase)
                 ogd = options['transcription'].grid_data
 
             timeseries_comp = RungeKuttaTimeseriesOutputComp(input_grid_data=gd,

diff --git a/dymos/transcriptions/solve_ivp/solve_ivp.py b/dymos/transcriptions/solve_ivp/solve_ivp.py
@@ -45,7 +45,7 @@ def initialize(self):
                                   'segment.  If an int (n) then results are provided at n '
                                   'equally distributed points in time within each segment.')
 
-    def setup_grid(self, phase):
+    def init_grid(self):
         pass
 
     def setup_time(self, phase):

diff --git a/dymos/transcriptions/transcription_base.py b/dymos/transcriptions/transcription_base.py
@@ -39,24 +39,21 @@ def __init__(self, **kwargs):
         self._declare_options()
         self.initialize()
         self.options.update(kwargs)
+        self.init_grid()
 
     def _declare_options(self):
         pass
 
     def initialize(self):
         pass
 
-    def setup_grid(self, phase):
+    def init_grid(self):
         """
         Setup the GridData object for the Transcription
-
-        Parameters
-        ----------
-        phase
-            The phase to which this transcription applies.
         """
+
         raise NotImplementedError('Transcription {0} does not implement method'
-                                  'setup_grid.'.format(self.__class__.__name__))
+                                  'init_grid.'.format(self.__class__.__name__))
 
     def setup_time(self, phase):
         """