Commit 318f1ff8 authored by Wysocki, Aaron's avatar Wysocki, Aaron
Browse files

Small changes and comments; all tests pass

parent f5956e4b

SubKit/build/Model.py

+0 −1
Original line number Diff line number Diff line
@@ -566,7 +566,6 @@ class Model: 
              heat generated in the rods will be directly deposited into the fluid and bypass going through

              the rod surface.

        """

#        nRods = me.getTotalPins()

        nRods = me.getTotalFuelRods()

        if nRods == 0:

            raise RuntimeError('setTotalCorePower must be called after the solid geometries are defined.')

SubKit/build/SquareLatticeLWR_Nodal.py

+15 −16
Original line number Diff line number Diff line
@@ -1195,27 +1195,26 @@ class SquareLatticeLWR_Nodal(CoreBuilder.Core): 
                radPowers.append(radialPower(

                    utils.radialLocation(obj.x, obj.y)))



        # Renormalize the radial powers

        # Renormalize the radial powers over all fuel rods. Set the

        # radial power factor for unheated pins to 1.0 (these pins

        # will be assigned a zero axial power shape, so their power

        # will still come out zero).

        radP = []

        mults = []

        powMults = []

        for i, obj in enumerate(me.model.solidObjects.values()):

            solidID = me.model.solidObjects.keys()[i]

            radP.append(obj.power)



            print('i '+str(i))

#            mults.append(obj.mult)



#            pdb.set_trace()

            powMult = 0.

            if solidID in me.model.solidTypeIDs:

            objType = me.model.solidTypeIDs[solidID]

            # powMults contains the number of fuel rod pins in each

            # solid (does not include unheated pins like obj.mult

            # does)

            if isinstance(me.model.solidTypes[objType], Solid.FuelRod):

                    powMult = obj.mult

            mults.append(powMult)

        radP = np.array(radP) / np.average(np.array(radP), weights=mults)

                powMults.append(obj.mult)

            else:

                powMults.append(0.)

        radP = np.array(radP) / np.average(np.array(radP), weights=powMults)

        for i, obj in enumerate(me.model.solidObjects.values()):

#            pdb.set_trace()

            if mults[i] > 0:

            if powMults[i] > 0:

                obj.power = radP[i]

            else:

                obj.power = 1.0