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

Fix tests

parent cd6dcfdf

SubKit/build/Model.py

+2 −8
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ class Model: 
        me.symOpt = None



        # Steady state convergence criteria

        me.steadyConvergenceCriteria = {'massBalance': 0.1,

                                        'energyBalance': 0.1,

        me.steadyConvergenceCriteria = {'massBalance': 1e-3,

                                        'energyBalance': 1e-3,

                                        'maxIterations': 10000,

                                        'p_l2': 1e-4,

                                        'p_linf': 1e-3,
@@ -613,9 +613,6 @@ class Model: 
            sections = [section]

        chans = []

        percents = []

        if not me.hasOuterConnections(solidID):

            raise RuntimeError("Solid ID: " + str(solidID) +

                               " does not have any channels connected to outside surface.")

        for i, ch in enumerate(me.channelsOuter[solidID]):

            if me.getSectionOfChannel(ch) in sections:

                chans.append(ch)
@@ -639,9 +636,6 @@ class Model: 
           (list of channel IDs connected to the inside surface of the solid, list of percentages of each connection)



        """

        if not me.hasInnerConnections(solidID):

            raise RuntimeError("The solidID: " + str(solidID) +

                               " does not have inner connections")

        chans = []

        percents = []

        for i, ch in enumerate(me.channelsInner[solidID]):

tests/ctfTraining/pincell/deck.inp.gold

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ end 14 
*Card 19.2 - absolute stopping criteria [pressure in psia|bar, velocity in ft/s|m/s,

** and temperature in F|C]

** LIAVOID  LIAPRESS  LIATCOOL LIATSOLID     LIAVL     LIAVV     LIAVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04

 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

*Card 19.2   [%]

** ENERGYBAL     MASSBAL

   1.000000e-01   1.000000e-01
@@ -226,4 +226,4 @@ end 14 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

** and temperature in F|C]

** L2AVOID  L2APRESS  L2ATCOOL L2ATSOLID     L2AVL     L2AVV     L2AVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04
 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

tests/mcfr/deck.inp.gold

+2 −2
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ end 14 
*Card 19.2 - absolute stopping criteria [pressure in psia|bar, velocity in ft/s|m/s,

** and temperature in F|C]

** LIAVOID  LIAPRESS  LIATCOOL LIATSOLID     LIAVL     LIAVV     LIAVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04

 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

*Card 19.2   [%]

** ENERGYBAL     MASSBAL

   1.000000e-01   1.000000e-01
@@ -1362,4 +1362,4 @@ end 14 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

** and temperature in F|C]

** L2AVOID  L2APRESS  L2ATCOOL L2ATSOLID     L2AVL     L2AVV     L2AVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04
 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

tests/msrTraining/pincell/deck.inp.gold

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ end 14 
*Card 19.2 - absolute stopping criteria [pressure in psia|bar, velocity in ft/s|m/s,

** and temperature in F|C]

** LIAVOID  LIAPRESS  LIATCOOL LIATSOLID     LIAVL     LIAVV     LIAVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04

 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

*Card 19.2   [%]

** ENERGYBAL     MASSBAL

   1.000000e-01   1.000000e-01
@@ -238,4 +238,4 @@ end 14 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

** and temperature in F|C]

** L2AVOID  L2APRESS  L2ATCOOL L2ATSOLID     L2AVL     L2AVV     L2AVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04
 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

tests/msre/fullCoreLoop/deck.inp.gold

+3 −3
Original line number Diff line number Diff line
@@ -7831,14 +7831,14 @@ end 14 
*Card 19.2 - absolute stopping criteria [pressure in psia|bar, velocity in ft/s|m/s,

** and temperature in F|C]

** LIAVOID  LIAPRESS  LIATCOOL LIATSOLID     LIAVL     LIAVV     LIAVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04

 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

*Card 19.2   [%]

** ENERGYBAL     MASSBAL

   1.000000e+12   1.000000e+12

   1.000000e+14   1.000000e+14

*Card 19.4   [%]

** L2PRESS   L2TCOOL  L2TSOLID      L2VL      L2VV      L2VD

*Card 19.5 - absolute stopping criteria [pressure in psia|bar, velocity in ft/s|m/s,

 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04

** and temperature in F|C]

** L2AVOID  L2APRESS  L2ATCOOL L2ATSOLID     L2AVL     L2AVV     L2AVD

 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04 1.000E-04
 
 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04 1.000e-04