geomach · geomach · Jun 12, 2015 · Jun 12, 2015 · Jun 12, 2015 · Jun 12, 2015
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -0,0 +1,23 @@
+name: Pylint
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pylint
+    - name: Analysing the code with pylint
+      run: |
+        pylint $(git ls-files '*.py')
diff --git a/.gitignore b/.gitignore
diff --git a/GeoMACH/BSE/BSEmodel.py b/GeoMACH/BSE/BSEmodel.py
@@ -459,10 +459,12 @@ def compute_projection(self, name, pts, surf_pts=None, ndim=1):
 
         npts = pts.shape[0]
         nsurf_pts = surf_pts.shape[0]
+        nrefine = 10
         surfs, ind_u, ind_v \
             = BSElib.computeproj(npts, nsurf_pts, 
                                  size['cp_str'], size['pt_str'], 
-                                 num['surf'], num['group'], surf_pts,
+                                 num['surf'], num['group'], nrefine,
+                                 surf_pts,
                                  str_indices['cp'], str_indices['pt'],
                                  topo['surf_group'], bspline['order'],
                                  bspline['num_cp'], bspline['num_pt'],

diff --git a/GeoMACH/BSE/BSEvec.py b/GeoMACH/BSE/BSEvec.py
diff --git a/GeoMACH/BSE/__init__.py b/GeoMACH/BSE/__init__.py
diff --git a/GeoMACH/BSE/test.py b/GeoMACH/BSE/test.py
@@ -55,6 +55,7 @@ def cube(nx, ny, nz, rx, ry, rz):
 surf.compute_projection('test', pts0, ndim=3)
 surf.apply_jacobian('test', 'd(test)/d(cp_str)', 'cp_str')
 pts = numpy.array(surf.vec['test'].array)
+print pts
 #surf.vec['df'].export_tec_scatter()
 surf.vec['pt_str'].export_tec_str()
 #surf.vec['pt_str'].export_STL()

diff --git a/GeoMACH/PGM/__init__.py b/GeoMACH/PGM/__init__.py
diff --git a/GeoMACH/PGM/airfoils/n64206.dat b/GeoMACH/PGM/airfoils/n64206.dat
diff --git a/GeoMACH/PGM/airfoils/rae2822.dat b/GeoMACH/PGM/airfoils/rae2822.dat
diff --git a/GeoMACH/PGM/components/PGMbody.py b/GeoMACH/PGM/components/PGMbody.py
diff --git a/GeoMACH/PGM/components/PGMcone.py b/GeoMACH/PGM/components/PGMcone.py
diff --git a/GeoMACH/PGM/components/PGMinterpolant.py b/GeoMACH/PGM/components/PGMinterpolant.py
@@ -95,7 +95,7 @@ def compute_normals(self):
                 self._bse.apply_jacobian(qname, 'd(' + qname + ')/d(cp_str)', 'cp_str')
 
             cross = numpy.cross(self._bse.vec[name + '_du'].array, self._bse.vec[name + '_dv'].array)
-            norms = numpy.linalg.norm(cross, axis=1)
+            norms = numpy.sqrt(numpy.sum(cross**2,axis=1))
 
             for ind in xrange(3):
                 cross[:, ind] /= norms

diff --git a/GeoMACH/PGM/components/PGMjunction.py b/GeoMACH/PGM/components/PGMjunction.py
diff --git a/GeoMACH/PGM/components/PGMprimitive.py b/GeoMACH/PGM/components/PGMprimitive.py
diff --git a/GeoMACH/PGM/components/PGMshell.py b/GeoMACH/PGM/components/PGMshell.py
diff --git a/GeoMACH/PGM/components/PGMtip.py b/GeoMACH/PGM/components/PGMtip.py
diff --git a/GeoMACH/PGM/components/PGMwing.py b/GeoMACH/PGM/components/PGMwing.py
diff --git a/GeoMACH/PGM/components/__init__.py b/GeoMACH/PGM/components/__init__.py
diff --git a/GeoMACH/PGM/core/MACHconfiguration.py b/GeoMACH/PGM/core/MACHconfiguration.py
@@ -15,6 +15,7 @@ def __init__(self):
         self.diff = OrderedDict()
         self.jacobians = OrderedDict()
         self.updated = {}
+	self.debug = False
 
     def addPointSet(self, points, pt_name, origConfig=True, **kwargs):
         bse = self._bse
@@ -26,6 +27,13 @@ def addPointSet(self, points, pt_name, origConfig=True, **kwargs):
 	    self.jacobians[pt_name] = bse.jac['d(' + pt_name + ')/d(cp_str)']
             self.diff[pt_name] = points - self.jacobians[pt_name].dot(bse.vec['cp_str'].array)
 
+        ### FOR DEBUGGING (Print projected points)
+	if self.debug is True:
+            bse.apply_jacobian(pt_name, 'd(' + pt_name + ')/d(cp_str)', 'cp_str')
+            bse.vec[pt_name].export_tec_scatter('projected_points.dat')
+            bse.vec[pt_name].array[:, :] = points
+            bse.vec[pt_name].export_tec_scatter('CFD_surf_points.dat')
+
         self.updated[pt_name] = False
 
     def setDesignVars(self, dv_dict):

diff --git a/GeoMACH/PGM/core/PGMcomponent.py b/GeoMACH/PGM/core/PGMcomponent.py
@@ -42,6 +42,8 @@ def __init__(self):
         self._num_surf = {}
         self._shapes = {}
 
+        self.funcs = {}
+
     def initialize_props(self):
         """ Adds the *X*, *Y*, and *Z* shape properties """
         props = self.props

diff --git a/GeoMACH/PGM/core/PGMconfiguration.py b/GeoMACH/PGM/core/PGMconfiguration.py
diff --git a/GeoMACH/PGM/core/PGMdv.py b/GeoMACH/PGM/core/PGMdv.py
diff --git a/GeoMACH/PGM/core/PGMface.py b/GeoMACH/PGM/core/PGMface.py
diff --git a/GeoMACH/PGM/core/PGMobject.py b/GeoMACH/PGM/core/PGMobject.py
diff --git a/GeoMACH/PGM/core/PGMparameter.py b/GeoMACH/PGM/core/PGMparameter.py
diff --git a/GeoMACH/PGM/core/PGMproperty.py b/GeoMACH/PGM/core/PGMproperty.py
diff --git a/GeoMACH/PGM/core/PGMsurf.py b/GeoMACH/PGM/core/PGMsurf.py
diff --git a/GeoMACH/PGM/core/PGMvec.py b/GeoMACH/PGM/core/PGMvec.py
diff --git a/GeoMACH/PGM/core/__init__.py b/GeoMACH/PGM/core/__init__.py
diff --git a/GeoMACH/PSM/BDFwriter.py b/GeoMACH/PSM/BDFwriter.py
diff --git a/GeoMACH/PSM/QUAD.py b/GeoMACH/PSM/QUAD.py
diff --git a/GeoMACH/PSM/__init__.py b/GeoMACH/PSM/__init__.py
diff --git a/GeoMACH/PSM/airframe.py b/GeoMACH/PSM/airframe.py
diff --git a/GeoMACH/__init__.py b/GeoMACH/__init__.py
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.txt b/README.txt
@@ -28,3 +28,21 @@ Installing and getting started (linux or Mac)
 5. Run the example:
    $ cd [GeoMACH-top]/examples
    $ python conventional.py
+
+Installing on a local directory (linux or Mac, for clusters)
+---------------------------------------------
+[GeoMACH-top] = path to the top-level GeoMACH directory
+
+1. Install (or load) numpy, scipy
+
+2. Install GeoMACH:
+   $ cd [GeoMACH-top]
+   $ python setup.py build --fcompiler=intelem (you may use another compiler)
+   $ python setup.py install --user
+
+3. You have to manually copy all airfoils to the installation folder
+   $ cp -r GeoMACH/PGM/airfoils ~/.local/lib/python2.7/site-packages/GeoMACH-0.1-py2.7-linux-x86_64.egg/GeoMACH/PGM/
+
+4. Run the example:
+   $ cd examples
+   $ python conventional.py
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/src/Conventional.rst b/docs/src/Conventional.rst
diff --git a/docs/src/GeoMACH.BSE.rst b/docs/src/GeoMACH.BSE.rst
diff --git a/docs/src/GeoMACH.PGM.components.rst b/docs/src/GeoMACH.PGM.components.rst
diff --git a/docs/src/GeoMACH.PGM.core.rst b/docs/src/GeoMACH.PGM.core.rst
diff --git a/docs/src/GeoMACH.PGM.rst b/docs/src/GeoMACH.PGM.rst
diff --git a/docs/src/GeoMACH.rst b/docs/src/GeoMACH.rst
diff --git a/docs/src/Images/UML2.svg b/docs/src/Images/UML2.svg
diff --git a/docs/src/Images/body.png b/docs/src/Images/body.png
diff --git a/docs/src/Images/bsplines.png b/docs/src/Images/bsplines.png
diff --git a/docs/src/Images/cone.png b/docs/src/Images/cone.png
diff --git a/docs/src/Images/conventional.jpg b/docs/src/Images/conventional.jpg
diff --git a/docs/src/Images/cp.png b/docs/src/Images/cp.png
diff --git a/docs/src/Images/d8.jpg b/docs/src/Images/d8.jpg
diff --git a/docs/src/Images/df.png b/docs/src/Images/df.png
diff --git a/docs/src/Images/geom1.png b/docs/src/Images/geom1.png
diff --git a/docs/src/Images/hwb.png b/docs/src/Images/hwb.png
diff --git a/docs/src/Images/joinedwing.jpg b/docs/src/Images/joinedwing.jpg
diff --git a/docs/src/Images/junction.jpg b/docs/src/Images/junction.jpg
diff --git a/docs/src/Images/junction.png b/docs/src/Images/junction.png
diff --git a/docs/src/Images/junction1.jpg b/docs/src/Images/junction1.jpg
diff --git a/docs/src/Images/primitives.png b/docs/src/Images/primitives.png
diff --git a/docs/src/Images/primitives0.png b/docs/src/Images/primitives0.png
diff --git a/docs/src/Images/pt.png b/docs/src/Images/pt.png
diff --git a/docs/src/Images/shell.png b/docs/src/Images/shell.png
diff --git a/docs/src/Images/strutbraced.jpg b/docs/src/Images/strutbraced.jpg
diff --git a/docs/src/Images/supersonic.png b/docs/src/Images/supersonic.png
diff --git a/docs/src/Images/tip.png b/docs/src/Images/tip.png
diff --git a/docs/src/Images/wing.png b/docs/src/Images/wing.png
diff --git a/docs/src/Tutorials.rst b/docs/src/Tutorials.rst
diff --git a/examples/RC_aircraft_tutorial.py b/examples/RC_aircraft_tutorial.py
diff --git a/examples/conventional.py b/examples/conventional.py
diff --git a/examples/supersonic.py b/examples/supersonic.py
diff --git a/examples/trussbraced_full.py b/examples/trussbraced_full.py
diff --git a/examples/trussbraced_wingstrut.py b/examples/trussbraced_wingstrut.py
diff --git a/examples/wing.py b/examples/wing.py
@@ -62,6 +62,7 @@ def meshStructure(self, res, filename):
     bse = pgm.initialize()
     pgm.comps['wing'].set_airfoil('rae2822.dat')
     bse.vec['pt_str'].export_tec_str()
-
+    bse.vec['cp_str'].export_IGES()
+    exit()
     for num in [20]:#[5, 10, 20, 50, 100]:
         pgm.meshStructure(num, 'wing_'+str(num))
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/src/BSE/bspline_basis.f90 b/src/BSE/bspline_basis.f90
diff --git a/src/BSE/bspline_knot.f90 b/src/BSE/bspline_knot.f90
diff --git a/src/BSE/bspline_param.f90 b/src/BSE/bspline_param.f90
diff --git a/src/BSE/compute_bs_jacobian.f90 b/src/BSE/compute_bs_jacobian.f90
diff --git a/src/BSE/compute_cp_jacobian.f90 b/src/BSE/compute_cp_jacobian.f90
diff --git a/src/BSE/compute_df_jacobian.f90 b/src/BSE/compute_df_jacobian.f90
diff --git a/src/BSE/compute_in_jacobian.f90 b/src/BSE/compute_in_jacobian.f90
diff --git a/src/BSE/compute_indices.f90 b/src/BSE/compute_indices.f90