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

Name change updates

And remove html doc from repo
parent 8bed863a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ MCFR
.DS_Store
*.png
wasp/build
doc/sphinxdoc
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ before_script:
tests:
   type: test
   tags:
      - ctfDeckBuilder
      - smbuilder
   variables:
      BLD_NAME: "ctfDeckBuilder_tests"
      BLD_DIR: "/tmp/$BLD_NAME"
+2 −2
Original line number Diff line number Diff line
CtfDeckBuilder
==============
SMBuilder
=========

See [here](doc/index.rst) for information on this package.
+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ mpl.use('Agg')
import matplotlib.pyplot as plt
import matplotlib.patches as patches
import numpy as np
import CtfDeckBuilder as cdb
import SMBuilder as cdb
import Solid
import Section
import utils
@@ -59,13 +59,13 @@ class Core(object):
class MSRE(Core):
   """ Core extension for building core geometry map for the MSRE.

   Pass in the CtfModel object for this model and it will be populated with the core region
   Pass in the Model object for this model and it will be populated with the core region
   channel and rod information that was passed in as simple maps. 
   This is a utility that simplifies generating the repetative geometry and connection information in
   the core region for the particular MSRE design.

   Args:
      model (CtfModel): The CTF model object
      model (Model): The CTF model object
      coreMap (int): A list of lists (2D list).  Should be populated with ones and zeros where '1' is a rod and '0' is
         a blank spot in the map.  Must be square in shape.   Provide the full symmetry map.
      sym_opt (int): Enter either 1 for full core geometry or 4 for quarter symmetry geometry.
@@ -85,7 +85,7 @@ class MSRE(Core):
   """
   def __init__(me, model, coreMap, sym_opt, grBlockWidth, dz, startChanIndex, chLen, chWidth, chArea, chPw, rodDomains=None):
   
      assert(isinstance(model, cdb.CtfDeckBuilder))
      assert(isinstance(model, cdb.Model))
      assert(len(coreMap)>0)
      assert(utils.isArraySquare(coreMap))
      assert(grBlockWidth>0)
Loading