Commit b4f33091 authored by Vineet Kumar's avatar Vineet Kumar
Browse files

Chnaged solid geo to geo 

_ref
parent f968ca79

SubKit/build/InpParse.py

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ class InpParse(object): 
        """ Returns the solid geo ID for passed solid object ID """

        assert(solidID in me.getSolidIDs())

        solid = me._getSolid(solidID)

        return solid['geo']['value']

        return solid['geo_ref']['value']



    def getSolidPercents(me,solidID):

        """ Returns the list of percentage of channels connected to the solid object for the passed solid ID """

SubKit/build/input.sch

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ solid{ 
         MinValInc=1

      }

   }

   geo{

   geo_ref{

      Description="ID of the solid reference geometry defined in the solid_geo block."

      ### Appearance="ID must exist in the 'solid_geo' block"

      MinOccurs=1

tests/ctfTraining/ge3x3/3x3.cdb

+9 −9
Original line number Diff line number Diff line
@@ -194,39 +194,39 @@ solid_geo id 1 
#===================================================



solid id 1

   geo 1

   geo_ref 1

   chconn 1 2 5 6

   pct 0.25 0.25 0.25 0.25

solid id 2

   geo 1

   geo_ref 1

   chconn 2 3 6 7

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   geo_ref 1

   chconn 3 4 7 8

   pct 0.25 0.25 0.25 0.25

solid id 4

   geo 1

   geo_ref 1

   chconn 5 6 9 10

   pct 0.25 0.25 0.25 0.25

solid id 5

   geo 1

   geo_ref 1

   chconn 6 7 10 11

   pct 0.25 0.25 0.25 0.25

solid id 6

   geo 1

   geo_ref 1

   chconn 7 8 11 12

   pct 0.25 0.25 0.25 0.25

solid id 7

   geo 1

   geo_ref 1

   chconn 9 10 13 14

   pct 0.25 0.25 0.25 0.25

solid id 8

   geo 1

   geo_ref 1

   chconn 10 11 14 15

   pct 0.25 0.25 0.25 0.25

solid id 9

   geo 1

   geo_ref 1

   chconn 11 12 15 16

   pct 0.25 0.25 0.25 0.25

tests/inputRegression/2x2.cdb

+4 −4
Original line number Diff line number Diff line
@@ -135,20 +135,20 @@ solid_geo id 1 
# Solid objects

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

solid id 1

   geo 1

   geo_ref 1

   chconn 1 2 4 5

   pct 0.25 0.25 0.25 0.25

   axpow 1

solid id 2

   geo 1

   geo_ref 1

   chconn 2 3 5 6

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   geo_ref 1

   chconn 4 5 7 8

   pct  0.25 0.25 0.25 0.25

solid id 4

   geo 1

   geo_ref 1

   chconn 5 6 8 9

   pct 0.25 0.25 0.25 0.25

tests/inputRegression/2x2_steadystate.cdb

+4 −4
Original line number Diff line number Diff line
@@ -149,20 +149,20 @@ solid_geo id 1 
   tclad 2.5e-4



solid id 1

   geo 1

   geo_ref 1

   chconn 1 2 4 5

   pct 0.25 0.25 0.25 0.25

   axpow 1

solid id 2

   geo 1

   geo_ref 1

   chconn 2 3 5 6

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   geo_ref 1

   chconn 4 5 7 8

   pct 0.25 0.25 0.25 0.25

solid id 4

   geo 1

   geo_ref 1

   chconn 5 6 8 9

   pct 0.25 0.25 0.25 0.25