Commit a2b55be0 authored by Kumar, Vineet's avatar Kumar, Vineet Committed by Salko Jr, Robert
Browse files

Modified ch to chconn for solids,gaps and losses

parent 0e8dfc0e

SMBuilder/InpParse.py

+4 −4
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ class InpParse(object): 
        """ Returns the list of channels connected to the solid object for the passed solid ID """

        assert(solidID in me.getSolidIDs())

        solid = me._getSolid(solidID)

        chIDs = solid.get('ch')

        chIDs = solid.get('chconn')

        if chIDs: chIDs = chIDs['value']

        if not chIDs:

            if len(me.chIDs) > 1:
@@ -526,7 +526,7 @@ class InpParse(object): 
        """ Returns the list of connected channels for the passed gap ID """

        assert(gapID in me.getGapIDs())

        gap = me._getGap(gapID)

        return gap['ch']['value']

        return gap['chconn']['value']



    def IsSolutionTypeTransient(me):

        """ Returns True/False for a transient/steady state simulation """
@@ -650,8 +650,8 @@ class InpParse(object): 
    def getFormLossChannels(me,lossGroup):

        """ Returns the channels for the passed form loss group number"""

        assert(lossGroup<me.numLossGroups)

        if 'ch' in me.inpDict['loss'][lossGroup]:

            return me.inpDict['loss'][lossGroup]['ch']['value']

        if 'chans' in me.inpDict['loss'][lossGroup]:

            return me.inpDict['loss'][lossGroup]['chans']['value']

        else:

            # Return all channels

            return me.chIDs

SMBuilder/input.sch

+3 −3
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ gap{ 
         ChildUniqueness="/gap/id/value"

      }

   }

   ch{

   chconn{

      MinOccurs=1

      MaxOccurs=1

      value{
@@ -585,7 +585,7 @@ solid{ 
         ValType=Int

      }

   }

   ch{

   chconn{

      MinOccurs=1

      MaxOccurs=1

      value{
@@ -685,7 +685,7 @@ axialpow{ 
}



loss{

   ch{

   chans{

      MinOccurs=0

      MaxOccurs=1

      value{

tests/inputRegression/2x2.cdb

+18 −18
Original line number Diff line number Diff line
@@ -62,51 +62,51 @@ ch id 9 
#===================================================



gap id 1

   ch 1 2

   chconn 1 2

   length 9.45e-3  # m

   width 1.55e-3 # m

gap id 2

   ch 1 4

   chconn 1 4

   length 9.45e-3

   width 1.55e-3

gap id 3

   ch 2 3

   chconn 2 3

   length 9.45e-3

   width 1.55e-3

gap id 4

   ch 2 5

   chconn 2 5

   length 9.45e-3

   width 3.1e-3

gap id 5

   ch 3 6

   chconn 3 6

   length 9.45e-3

   width 1.55e-3

gap id 6

   ch 4 5

   chconn 4 5

   length 9.45e-3

   width 3.1e-3

gap id 7

   ch 4 7

   chconn 4 7

   length 9.45e-3

   width 1.55e-3

gap id 8

   ch 5 6

   chconn 5 6

   length 9.45e-3

   width 3.1e-3

gap id 9

   ch 5 8

   chconn 5 8

   length 9.45e-3

   width 3.1e-3

gap id 10

   ch 6 9

   chconn 6 9

   length 9.45e-3

   width 1.55e-3

gap id 11

   ch 7 8

   chconn 7 8

   length 9.45e-3

   width 1.55e-3

gap id 12

   ch 8 9

   chconn 8 9

   length 9.45e-3

   width 1.55e-3
@@ -124,20 +124,20 @@ solid_geo id 1 
#===================================================

solid id 1

   geo 1

   ch 1 2 4 5

   chconn 1 2 4 5

   pct 0.25 0.25 0.25 0.25

   axpow 1

solid id 2

   geo 1

   ch 2 3 5 6

   chconn 2 3 5 6

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   ch 4 5 7 8

   chconn 4 5 7 8

   pct  0.25 0.25 0.25 0.25

solid id 4

   geo 1

   ch 5 6 8 9

   chconn 5 6 8 9

   pct 0.25 0.25 0.25 0.25



#===================================================
@@ -151,11 +151,11 @@ axialpow id 1 
# Form losses

#===================================================

loss

   ch 1 3 5 7

   chans 1 3 5 7

   levels 4 6 8

   k 0.5



loss

   ch 1 4 6 8

   chans 1 4 6 8

   levels 5 7 9

   k 0.4 0.3 0.2

tests/inputRegression/2x2_steadystate.cdb

+16 −16
Original line number Diff line number Diff line
@@ -94,51 +94,51 @@ ch id 9 
   ydim 6.3e-3



gap id 1

   ch 1 2

   chconn 1 2

   length 9.45e-3  # m

   width 1.55e-3 # m

gap id 2

   ch 1 4

   chconn 1 4

   length 9.45e-3

   width 1.55e-3

gap id 3

   ch 2 3

   chconn 2 3

   length 9.45e-3

   width 1.55e-3

gap id 4

   ch 2 5

   chconn 2 5

   length 9.45e-3

   width 3.1e-3

gap id 5

   ch 3 6

   chconn 3 6

   length 9.45e-3

   width 1.55e-3

gap id 6

   ch 4 5

   chconn 4 5

   length 9.45e-3

   width 3.1e-3

gap id 7

   ch 4 7

   chconn 4 7

   length 9.45e-3

   width 1.55e-3

gap id 8

   ch 5 6

   chconn 5 6

   length 9.45e-3

   width 3.1e-3

gap id 9

   ch 5 8

   chconn 5 8

   length 9.45e-3

   width 3.1e-3

gap id 10

   ch 6 9

   chconn 6 9

   length 9.45e-3

   width 1.55e-3

gap id 11

   ch 7 8

   chconn 7 8

   length 9.45e-3

   width 1.55e-3

gap id 12

   ch 8 9

   chconn 8 9

   length 9.45e-3

   width 1.55e-3
@@ -150,20 +150,20 @@ solid_geo id 1 


solid id 1

   geo 1

   ch 1 2 4 5

   chconn 1 2 4 5

   pct 0.25 0.25 0.25 0.25

   axpow 1

solid id 2

   geo 1

   ch 2 3 5 6

   chconn 2 3 5 6

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   ch 4 5 7 8

   chconn 4 5 7 8

   pct 0.25 0.25 0.25 0.25

solid id 4

   geo 1

   ch 5 6 8 9

   chconn 5 6 8 9

   pct 0.25 0.25 0.25 0.25



axialpow id 1

tests/inputRegression/2x2_transient.cdb

+16 −16
Original line number Diff line number Diff line
@@ -95,51 +95,51 @@ ch id 9 
   ydim  6.3e-3



gap id 1

   ch 1 2

   chconn 1 2

   length 9.45e-3  # m

   width  1.55e-3 # m

gap id 2

   ch 1 4

   chconn 1 4

   length 9.45e-3

   width 1.55e-3

gap id 3

   ch 2 3

   chconn 2 3

   length 9.45e-3

   width 1.55e-3

gap id 4

   ch 2 5

   chconn 2 5

   length 9.45e-3

   width 3.1e-3

gap id 5

   ch 3 6

   chconn 3 6

   length 9.45e-3

   width 1.55e-3

gap id 6

   ch 4 5

   chconn 4 5

   length 9.45e-3

   width 3.1e-3

gap id 7

   ch 4 7

   chconn 4 7

   length 9.45e-3

   width 1.55e-3

gap id 8

   ch 5 6

   chconn 5 6

   length 9.45e-3

   width 3.1e-3

gap id 9

   ch 5 8

   chconn 5 8

   length 9.45e-3

   width 3.1e-3

gap id 10

   ch 6 9

   chconn 6 9

   length 9.45e-3

   width 1.55e-3

gap id 11

   ch 7 8

   chconn 7 8

   length 9.45e-3

   width 1.55e-3

gap id 12

   ch 8 9

   chconn 8 9

   length 9.45e-3

   width 1.55e-3
@@ -151,21 +151,21 @@ solid_geo id 1 


solid id 1

   geo 1

   ch 1 2 4 5

   chconn 1 2 4 5

   pct 0.25 0.25 0.25 0.25

   axpow 1



solid id 2

   geo 1

   ch 2 3 5 6

   chconn 2 3 5 6

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   ch 4 5 7 8

   chconn 4 5 7 8

   pct 0.25 0.25 0.25 0.25

solid id 4

   geo 1

   ch 5 6 8 9

   chconn 5 6 8 9

   pct 0.25 0.25 0.25 0.25



axialpow id 1