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

Changed solid_geo ID type to string

parent 5446b0e4

SubKit/build/InpParse.py

+0 −5
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ class InpParse(object): 
        me.chIDs = list(sorted(me.chIDs))

        me.solidIDs = list(sorted(me.solidIDs))

        me.gapIDs = list(sorted(me.gapIDs))

        me.chgeoIDs = list(me.chgeoIDs)

        me.gapgeoIDs = list(sorted(me.gapgeoIDs))

        me.geoIDs = list(sorted(me.geoIDs))

        me.timeGroups = list(sorted(me.timeGroups))

        me.domainIDs = list(sorted(me.domainIDs))

        me.axialPowIDs = list(sorted(me.axialPowIDs))
@@ -139,8 +136,6 @@ class InpParse(object): 
            me.chIDsInSec[secID] = list(sorted(me.chIDsInSec[secID]))

        if not utils.oneToN(me.chIDs):

            raise InputError("Channel IDs are not consecutive integers")

        if not utils.oneToN(me.geoIDs):

            raise InputError("Solid geo IDs are not consecutive integers")

        if not utils.oneToN(me.solidIDs):

            raise InputError("Solid IDs are not consecutive integers")

        if me.gapIDs is not None:

SubKit/build/input.sch

+1 −4
Original line number Diff line number Diff line
@@ -726,8 +726,7 @@ solid_geo{ 
      value{

         MinOccurs=1

         MaxOccurs=1

         ValType=Int

         MinValInc=1

         ValType="String"

      }

   }

   type{
@@ -810,8 +809,6 @@ solid{ 
         MinOccurs=1

         MaxOccurs=1

         ExistsIn="/solid_geo/id/value"

         MinValInc=1

         ValType=Int

      }

   }

   chconn{

tests/inputRegression/3x3.cdb

+10 −10
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ gap id 24 
# Solid geometries

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



solid_geo id 1

solid_geo id "Tube"

   type "tube"

   dout 14.478e-3

   din  12.478e-3
@@ -204,39 +204,39 @@ solid_geo id 1 
#===================================================



solid id 1

   geo 1

   geo "Tube"

   chconn 1 2 5 6

   pct 0.25 0.25 0.25 0.25

solid id 2

   geo 1

   geo "Tube"

   chconn 2 3 6 7

   pct 0.25 0.25 0.25 0.25

solid id 3

   geo 1

   geo "Tube"

   chconn 3 4 7 8

   pct 0.25 0.25 0.25 0.25

solid id 4

   geo 1

   geo "Tube"

   chconn 5 6 9 10

   pct 0.25 0.25 0.25 0.25

solid id 5

   geo 1

   geo "Tube"

   chconn 6 7 10 11

   pct 0.25 0.25 0.25 0.25

solid id 6

   geo 1

   geo "Tube"

   chconn 7 8 11 12

   pct 0.25 0.25 0.25 0.25

solid id 7

   geo 1

   geo "Tube"

   chconn 9 10 13 14

   pct 0.25 0.25 0.25 0.25

solid id 8

   geo 1

   geo "Tube"

   chconn 10 11 14 15

   pct 0.25 0.25 0.25 0.25

solid id 9

   geo 1

   geo "Tube"

   chconn 11 12 15 16

   pct 0.25 0.25 0.25 0.25