Commit ed969a85 authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Fixes

parent 3470442e

SubKit/build/InpParse.py

+8 −10
Original line number Diff line number Diff line
@@ -744,23 +744,21 @@ class InpParse(object): 


    def getSteadyState_dtmin(me):

        """ Returns minimum timestep size if modeling steady-state"""

        result = None

        if 'solution' in me.inpDict:

            if 'steady' in me.inpDict['solution']:

                return me.inpDict['solution']['steady'].get('dtmin')['value']

            else:

                return None

        else:

            return None

                if 'dtmin' in me.inpDict['solution']['steady']:

                    result = me.inpDict['solution']['steady'].get('dtmin')['value']

        return result



    def getSteadyState_dtmax(me):

        """ Returns maximum timestep size if modeling steady-state"""

        result = None

        if 'solution' in me.inpDict:

            if 'steady' in me.inpDict['solution']:

                return me.inpDict['solution']['steady'].get('dtmax')['value']

            else:

                return None

        else:

            return None

                if 'dtmax' in me.inpDict['solution']['steady']:

                   result = me.inpDict['solution']['steady'].get('dtmax')['value']

        return result



    def getNumFormLosses(me):

        """ Returns number of form losses in the model"""

tests/ctfTraining/ge3x3/3x3.inp

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ end 14 
**NGR

   15

*Card 15.1

  1.0000E-06  1.0000E-01  1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

**        DTMIN          DTMAX           TEND          EDINT         DMPINT          RTWFP     MAXITS

    1.00000e-06    1.00000e-01     1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

***********************************************************************************************

*GROUP 19 - convergence Criteria for Steady State Solve

***********************************************************************************************

tests/ctfTraining/ge3x3/3x3.inp.gold

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ end 14 
**NGR

   15

*Card 15.1

  1.0000E-06  1.0000E-01  1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

**        DTMIN          DTMAX           TEND          EDINT         DMPINT          RTWFP     MAXITS

    1.00000e-06    1.00000e-01     1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

***********************************************************************************************

*GROUP 19 - convergence Criteria for Steady State Solve

***********************************************************************************************

tests/inputRegression/2x2.inp

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ end 14 
**NGR

   15

*Card 15.1

  1.0000E-06  1.0000E-01  1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

**        DTMIN          DTMAX           TEND          EDINT         DMPINT          RTWFP     MAXITS

    1.00000e-06    1.00000e-01     1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

***********************************************************************************************

*GROUP 19 - convergence Criteria for Steady State Solve

***********************************************************************************************

tests/inputRegression/2x2.inp.gold

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ end 14 
**NGR

   15

*Card 15.1

  1.0000E-06  1.0000E-01  1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

**        DTMIN          DTMAX           TEND          EDINT         DMPINT          RTWFP     MAXITS

    1.00000e-06    1.00000e-01     1.0000E-01  0.0000E+00  0.0000E+00     1.000000e+02      10000

***********************************************************************************************

*GROUP 19 - convergence Criteria for Steady State Solve

***********************************************************************************************