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

Set gap conductance to 0.0 when using dynamic gap model

parent 47250a55

SubKit/build/Model.py

+7 −1
Original line number Diff line number Diff line
@@ -1731,8 +1731,14 @@ class Model: 
                        if pinObj.gapConductance <= 0.0:

                            raise RuntimeError(

                                "Gap conductance for pin " + str(solidID) + " is invalid: " + str(pinObj.gapConductance))

                        # Cannot use the dynamic gap model if gap conductance was manually set

                        if geom.gapModel == 'dynamic':

                            raise RuntimeError("Cannot set gap conductance for pin: "+str(solidID)+" which uses a solid geometry that uses the dynamic gap model: "+str(solidTypeID))

                    else:

                        # Set to reasonable default

                        if geom.gapModel == 'dynamic':

                            pinObj.gapConductance = 0.0

                        else:

                            pinObj.gapConductance = DEFAULT_FUEL_ROD_GAP_CONDUCTANCE

                else:

                    # This is not a fuel rod, so the gap conductance should be zero

tests/gridModels/global/deck.inp.gold

+16 −16
Original line number Diff line number Diff line
@@ -527,37 +527,37 @@ 
**    N   IFTY   IAXP   NRND DAXMIN       RMULT         HGAP  ISECR       HTAMB        TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3

**NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE NSCH   PIE

      1      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      1      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     1 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      2      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      2      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     2 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      3      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      3      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     3 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      4      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      4      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     4 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      5      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      5      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     5 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      6      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      6      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     6 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      7      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      7      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     7 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      8      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      8      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     8 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      9      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      9      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     9 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     10      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     10      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    10 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     11      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     11      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    11 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     12      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     12      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    12 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     13      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     13      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    13 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     14      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     14      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    14 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     15      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     15      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    15 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     16      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     16      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    16 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

*Card 8.5

**    N   ISTYP      HPERIM     HPERIMI       RMULS  NOSLCH  NSLCHC       HTAMBS        TAMBS

tests/gridModels/levels/deck.inp.gold

+16 −16
Original line number Diff line number Diff line
@@ -527,37 +527,37 @@ 
**    N   IFTY   IAXP   NRND DAXMIN       RMULT         HGAP  ISECR       HTAMB        TAMB  SYMROD  HTCMAP TKEMAP NSUBAX NSUBAZ

*Card 8.3

**NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE  NSCH   PIE NSCH   PIE

      1      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      1      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     1 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      2      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      2      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     2 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      3      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      3      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     3 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      4      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      4      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     4 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      5      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      5      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     5 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      6      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      6      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     6 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      7      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      7      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     7 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      8      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      8      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     8 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

      9      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

      9      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     9 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     10      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     10      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    10 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     11      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     11      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    11 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     12      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     12      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    12 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     13      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     13      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    13 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     14      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     14      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    14 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     15      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     15      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    15 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

     16      1      3      0       0  6.6000e+01  5.7000e+03      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

     16      1      3      0       0  6.6000e+01  0.0000e+00      1  0.0000e+00  0.0000e+00    1.000      0      0      1      1

    16 1.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000     0 0.000

*Card 8.5

**    N   ISTYP      HPERIM     HPERIMI       RMULS  NOSLCH  NSLCHC       HTAMBS        TAMBS

tests/nodal_p7/nodal_p7.inp.gold

+772 −772

File changed.

Preview size limit exceeded, changes collapsed.