From 78926300ca0fc36f495d1844076806ba069223f1 Mon Sep 17 00:00:00 2001 From: Josh Anibal Date: Tue, 16 Jun 2020 16:57:33 -0400 Subject: [PATCH] use setup.py (#21) Co-authored-by: Neil Wu --- .travis.yml | 8 +- __init__.py | 4 - doc/building.rst | 57 +--- .../AhmedBodyCoarse/FFD/generateFFD.py | 0 .../AhmedBodyCoarse/constant/RASProperties | 0 .../constant/polyMesh/boundary | 0 .../constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellZones | 0 .../constant/polyMesh/faceZones | 0 .../AhmedBodyCoarse/constant/polyMesh/faces | 0 .../constant/polyMesh/level0Edge | 0 .../constant/polyMesh/neighbour | 0 .../AhmedBodyCoarse/constant/polyMesh/owner | 0 .../constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointZones | 0 .../constant/polyMesh/points_orig | 0 .../constant/polyMesh/refinementHistory | 0 .../constant/polyMesh/surfaceIndex | 0 .../constant/transportProperties | 0 .../constant/triSurface/README | 0 .../AhmedBodyCoarse/processor0/0/U | 0 .../AhmedBodyCoarse/processor0/0/k | 0 .../AhmedBodyCoarse/processor0/0/nut | 0 .../AhmedBodyCoarse/processor0/0/omega | 0 .../AhmedBodyCoarse/processor0/0/p | 0 .../processor0/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor0/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor0/constant/polyMesh/faces | 0 .../processor0/constant/polyMesh/level0Edge | 0 .../processor0/constant/polyMesh/neighbour | 0 .../processor0/constant/polyMesh/owner | 0 .../processor0/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor0/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/processor1/0/U | 0 .../AhmedBodyCoarse/processor1/0/k | 0 .../AhmedBodyCoarse/processor1/0/nut | 0 .../AhmedBodyCoarse/processor1/0/omega | 0 .../AhmedBodyCoarse/processor1/0/p | 0 .../processor1/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor1/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor1/constant/polyMesh/faces | 0 .../processor1/constant/polyMesh/level0Edge | 0 .../processor1/constant/polyMesh/neighbour | 0 .../processor1/constant/polyMesh/owner | 0 .../processor1/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor1/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/processor2/0/U | 0 .../AhmedBodyCoarse/processor2/0/k | 0 .../AhmedBodyCoarse/processor2/0/nut | 0 .../AhmedBodyCoarse/processor2/0/omega | 0 .../AhmedBodyCoarse/processor2/0/p | 0 .../processor2/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor2/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor2/constant/polyMesh/faces | 0 .../processor2/constant/polyMesh/level0Edge | 0 .../processor2/constant/polyMesh/neighbour | 0 .../processor2/constant/polyMesh/owner | 0 .../processor2/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor2/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/processor3/0/U | 0 .../AhmedBodyCoarse/processor3/0/k | 0 .../AhmedBodyCoarse/processor3/0/nut | 0 .../AhmedBodyCoarse/processor3/0/omega | 0 .../AhmedBodyCoarse/processor3/0/p | 0 .../processor3/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor3/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor3/constant/polyMesh/faces | 0 .../processor3/constant/polyMesh/level0Edge | 0 .../processor3/constant/polyMesh/neighbour | 0 .../processor3/constant/polyMesh/owner | 0 .../processor3/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor3/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/processor4/0/U | 0 .../AhmedBodyCoarse/processor4/0/k | 0 .../AhmedBodyCoarse/processor4/0/nut | 0 .../AhmedBodyCoarse/processor4/0/omega | 0 .../AhmedBodyCoarse/processor4/0/p | 0 .../processor4/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor4/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor4/constant/polyMesh/faces | 0 .../processor4/constant/polyMesh/level0Edge | 0 .../processor4/constant/polyMesh/neighbour | 0 .../processor4/constant/polyMesh/owner | 0 .../processor4/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor4/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/processor5/0/U | 0 .../AhmedBodyCoarse/processor5/0/k | 0 .../AhmedBodyCoarse/processor5/0/nut | 0 .../AhmedBodyCoarse/processor5/0/omega | 0 .../AhmedBodyCoarse/processor5/0/p | 0 .../processor5/constant/polyMesh/boundary | 0 .../constant/polyMesh/boundaryProcAddressing | 0 .../processor5/constant/polyMesh/cellLevel | 0 .../constant/polyMesh/cellProcAddressing | 0 .../constant/polyMesh/faceProcAddressing | 0 .../processor5/constant/polyMesh/faces | 0 .../processor5/constant/polyMesh/level0Edge | 0 .../processor5/constant/polyMesh/neighbour | 0 .../processor5/constant/polyMesh/owner | 0 .../processor5/constant/polyMesh/pointLevel | 0 .../constant/polyMesh/pointProcAddressing | 0 .../processor5/constant/polyMesh/points_orig | 0 .../AhmedBodyCoarse/run_warp.py | 0 .../structured/dotprod.py | 0 .../examples => examples}/structured/test.py | 0 .../unstructured/mdo_tutorial_ustruct.py | 0 {python => idwarp}/MExt.py | 0 {python => idwarp}/MultiUnstructuredMesh.py | 0 {python => idwarp}/MultiUnstructuredMesh_C.py | 0 {python => idwarp}/UnstructuredMesh.py | 0 {python => idwarp}/UnstructuredMesh_C.py | 0 idwarp/__init__.py | 6 + {python/input_files => input_files}/Readme.md | 0 python/__init__.py | 1 - .../AhmedBodyCoarse/FFD/bodyFittedFFD.fmt | 9 - .../AhmedBodyCoarse/FFD/globalFFD.fmt | 11 - .../idwarp_cs_par_reg.ref | 0 .../reg_tests => reg_tests}/idwarp_cs_reg.ref | 0 .../idwarp_par_reg | 0 reg_tests/idwarp_par_reg.ref | 250 ++++++++++++++++++ .../idwarp_reg.ref => reg_tests/idwarp_reg | 0 reg_tests/idwarp_reg.ref | 250 ++++++++++++++++++ .../mdo_regression_helper.py | 0 .../reg_tests => reg_tests}/run_reg_tests.py | 0 .../run_reg_tests_cs.py | 0 .../reg_tests => reg_tests}/solve_script.py | 0 .../solve_script_cs.py | 0 setup.py | 56 ++++ src/f2py/Makefile | 2 +- src_cs/f2py/Makefile | 2 +- 150 files changed, 583 insertions(+), 73 deletions(-) delete mode 100644 __init__.py rename {python/examples => examples}/AhmedBodyCoarse/FFD/generateFFD.py (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/RASProperties (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/cellZones (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/faceZones (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/pointZones (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/refinementHistory (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/polyMesh/surfaceIndex (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/transportProperties (100%) rename {python/examples => examples}/AhmedBodyCoarse/constant/triSurface/README (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor0/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor1/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor2/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor3/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor4/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/0/U (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/0/k (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/0/nut (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/0/omega (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/0/p (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/boundary (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/boundaryProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/cellLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/cellProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/faceProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/faces (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/level0Edge (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/neighbour (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/owner (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/pointLevel (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/pointProcAddressing (100%) rename {python/examples => examples}/AhmedBodyCoarse/processor5/constant/polyMesh/points_orig (100%) rename {python/examples => examples}/AhmedBodyCoarse/run_warp.py (100%) rename {python/examples => examples}/structured/dotprod.py (100%) rename {python/examples => examples}/structured/test.py (100%) rename {python/examples => examples}/unstructured/mdo_tutorial_ustruct.py (100%) rename {python => idwarp}/MExt.py (100%) rename {python => idwarp}/MultiUnstructuredMesh.py (100%) rename {python => idwarp}/MultiUnstructuredMesh_C.py (100%) rename {python => idwarp}/UnstructuredMesh.py (100%) rename {python => idwarp}/UnstructuredMesh_C.py (100%) create mode 100644 idwarp/__init__.py rename {python/input_files => input_files}/Readme.md (100%) delete mode 100644 python/__init__.py delete mode 100644 python/examples/AhmedBodyCoarse/FFD/bodyFittedFFD.fmt delete mode 100644 python/examples/AhmedBodyCoarse/FFD/globalFFD.fmt rename {python/reg_tests => reg_tests}/idwarp_cs_par_reg.ref (100%) rename {python/reg_tests => reg_tests}/idwarp_cs_reg.ref (100%) rename python/reg_tests/idwarp_par_reg.ref => reg_tests/idwarp_par_reg (100%) create mode 100644 reg_tests/idwarp_par_reg.ref rename python/reg_tests/idwarp_reg.ref => reg_tests/idwarp_reg (100%) create mode 100644 reg_tests/idwarp_reg.ref rename {python/reg_tests => reg_tests}/mdo_regression_helper.py (100%) rename {python/reg_tests => reg_tests}/run_reg_tests.py (100%) rename {python/reg_tests => reg_tests}/run_reg_tests_cs.py (100%) rename {python/reg_tests => reg_tests}/solve_script.py (100%) rename {python/reg_tests => reg_tests}/solve_script_cs.py (100%) create mode 100644 setup.py diff --git a/.travis.yml b/.travis.yml index f5876bd..29bf458 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ install: # We thrown away the existing repo in Docker, and copy the new one in-place - docker exec -it app /bin/bash -c "rm -rf $DOCKER_WORKING_DIR && cp -r $DOCKER_MOUNT_DIR $DOCKER_WORKING_DIR" # Download input files for regression testing - - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/idwarp/input_files.tar.gz && tar -xzf input_files.tar.gz" + - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/idwarp/input_files.tar.gz && tar -xzf input_files.tar.gz" # Copy over the correct config file and modify as needed - if [[ "$DOCKER_TAG" == "py3-centos7-impi" ]]; then docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && cp config/defaults/config.LINUX_INTEL_OPENMPI.mk config/config.mk"; @@ -47,12 +47,14 @@ install: # Compile real and complex builds - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && make && make -f Makefile_CS PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION" + # Install Python interface + - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && pip install ." script: # Real tests - - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && python run_reg_tests.py -nodiff" + - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && python run_reg_tests.py -nodiff" # Complex tests - - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py -nodiff" + - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py -nodiff" after_script: diff --git a/__init__.py b/__init__.py deleted file mode 100644 index 1772969..0000000 --- a/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from .python.UnstructuredMesh import USMesh -from .python.MultiUnstructuredMesh import MultiUSMesh -from .python.UnstructuredMesh_C import USMesh_C -from .python.MultiUnstructuredMesh_C import MultiUSMesh_C diff --git a/doc/building.rst b/doc/building.rst index 21037f0..7ee33bf 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -2,14 +2,19 @@ Building -------- +IDWarp depends on the follow libraries: +- CGNS Library +- PETSc +- MPI -All the core computations in :ref:`IDWarp` are coded in Fortran. It -is therefore necessary to build this library before using -:ref:`IDWarp`. +See the MDO Lab installation guide `here `_ for the supported versions and installation instructions. -To see a list of architectures that :ref:`IDWarp` has been known to +All the core computations in IDWarp are coded in Fortran. +It is therefore necessary to build this library before using IDWarp. + +To see a list of architectures that IDWarp has been known to compile on run:: - + make from the root directory. @@ -28,44 +33,10 @@ the screen (near the end):: If you don't see this, it will be necessary modify the configure options in the config file. -Now open ``config/config.mk`` which should look like:: - - # ---------------------------------------------------------------------- - # Config file for Gfortran with OpenMPI - # ---------------------------------------------------------------------- - - # ------- Define a possible parallel make ------------------------------ - PMAKE = make -j 4 - - # ------- Define the MPI Compilers-------------------------------------- - FF90 = mpif90 - CC = mpicc - - # ------- Define CGNS Inlcude and linker flags ------------------------- - CGNS_INCLUDE_FLAGS=-I$(HOME)/packages/cgnslib_3.2.1/src - CGNS_LINKER_FLAGS=-L$(HOME)/packages/cgnslib_3.2.1/src -lcgns - - # ------- Define Compiler Flags ---------------------------------------- - FF90_GEN_FLAGS = -fPIC - CC_GEN_FLAGS = -fPIC - - FF90_OPT_FLAGS = -fPIC -fdefault-real-8 -O2 - CC_OPT_FLAGS = -O2 - - # ------- Define Linker Flags ------------------------------------------ - LINKER_FLAGS = - - # ------- Define Petsc Info --- Should not need to modify this ----- - include ${PETSC_DIR}/lib/petsc/conf/variables # PETSc 3.6+ - #include ${PETSC_DIR}/conf/variables # PETSc 3.5 - PETSC_INCLUDE_FLAGS=${PETSC_CC_INCLUDES} -I$(PETSC_DIR) - PETSC_LINKER_FLAGS=${PETSC_LIB} - - # Define potentially different python, python-config and f2py executables: - PYTHON = python - PYTHON-CONFIG = python3-config # use python-config for python 2 - F2PY = f2py - It will most likely be necessary to modify the ``CGNS_INCLUDE_FLAGS`` and the ``CGNS_LINKER_FLAGS`` variables. After changes to the configuration file, run ``make clean`` before attempting a new build. + +Lastly, to build the Python interface, go to the root directory and type:: + + pip install . diff --git a/python/examples/AhmedBodyCoarse/FFD/generateFFD.py b/examples/AhmedBodyCoarse/FFD/generateFFD.py similarity index 100% rename from python/examples/AhmedBodyCoarse/FFD/generateFFD.py rename to examples/AhmedBodyCoarse/FFD/generateFFD.py diff --git a/python/examples/AhmedBodyCoarse/constant/RASProperties b/examples/AhmedBodyCoarse/constant/RASProperties similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/RASProperties rename to examples/AhmedBodyCoarse/constant/RASProperties diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/cellZones b/examples/AhmedBodyCoarse/constant/polyMesh/cellZones similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/cellZones rename to examples/AhmedBodyCoarse/constant/polyMesh/cellZones diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/faceZones b/examples/AhmedBodyCoarse/constant/polyMesh/faceZones similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/faceZones rename to examples/AhmedBodyCoarse/constant/polyMesh/faceZones diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/faces b/examples/AhmedBodyCoarse/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/owner b/examples/AhmedBodyCoarse/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/pointZones b/examples/AhmedBodyCoarse/constant/polyMesh/pointZones similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/pointZones rename to examples/AhmedBodyCoarse/constant/polyMesh/pointZones diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/refinementHistory b/examples/AhmedBodyCoarse/constant/polyMesh/refinementHistory similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/refinementHistory rename to examples/AhmedBodyCoarse/constant/polyMesh/refinementHistory diff --git a/python/examples/AhmedBodyCoarse/constant/polyMesh/surfaceIndex b/examples/AhmedBodyCoarse/constant/polyMesh/surfaceIndex similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/polyMesh/surfaceIndex rename to examples/AhmedBodyCoarse/constant/polyMesh/surfaceIndex diff --git a/python/examples/AhmedBodyCoarse/constant/transportProperties b/examples/AhmedBodyCoarse/constant/transportProperties similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/transportProperties rename to examples/AhmedBodyCoarse/constant/transportProperties diff --git a/python/examples/AhmedBodyCoarse/constant/triSurface/README b/examples/AhmedBodyCoarse/constant/triSurface/README similarity index 100% rename from python/examples/AhmedBodyCoarse/constant/triSurface/README rename to examples/AhmedBodyCoarse/constant/triSurface/README diff --git a/python/examples/AhmedBodyCoarse/processor0/0/U b/examples/AhmedBodyCoarse/processor0/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/0/U rename to examples/AhmedBodyCoarse/processor0/0/U diff --git a/python/examples/AhmedBodyCoarse/processor0/0/k b/examples/AhmedBodyCoarse/processor0/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/0/k rename to examples/AhmedBodyCoarse/processor0/0/k diff --git a/python/examples/AhmedBodyCoarse/processor0/0/nut b/examples/AhmedBodyCoarse/processor0/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/0/nut rename to examples/AhmedBodyCoarse/processor0/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor0/0/omega b/examples/AhmedBodyCoarse/processor0/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/0/omega rename to examples/AhmedBodyCoarse/processor0/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor0/0/p b/examples/AhmedBodyCoarse/processor0/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/0/p rename to examples/AhmedBodyCoarse/processor0/0/p diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor0/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor0/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor0/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/processor1/0/U b/examples/AhmedBodyCoarse/processor1/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/0/U rename to examples/AhmedBodyCoarse/processor1/0/U diff --git a/python/examples/AhmedBodyCoarse/processor1/0/k b/examples/AhmedBodyCoarse/processor1/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/0/k rename to examples/AhmedBodyCoarse/processor1/0/k diff --git a/python/examples/AhmedBodyCoarse/processor1/0/nut b/examples/AhmedBodyCoarse/processor1/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/0/nut rename to examples/AhmedBodyCoarse/processor1/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor1/0/omega b/examples/AhmedBodyCoarse/processor1/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/0/omega rename to examples/AhmedBodyCoarse/processor1/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor1/0/p b/examples/AhmedBodyCoarse/processor1/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/0/p rename to examples/AhmedBodyCoarse/processor1/0/p diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor1/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor1/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor1/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/processor2/0/U b/examples/AhmedBodyCoarse/processor2/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/0/U rename to examples/AhmedBodyCoarse/processor2/0/U diff --git a/python/examples/AhmedBodyCoarse/processor2/0/k b/examples/AhmedBodyCoarse/processor2/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/0/k rename to examples/AhmedBodyCoarse/processor2/0/k diff --git a/python/examples/AhmedBodyCoarse/processor2/0/nut b/examples/AhmedBodyCoarse/processor2/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/0/nut rename to examples/AhmedBodyCoarse/processor2/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor2/0/omega b/examples/AhmedBodyCoarse/processor2/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/0/omega rename to examples/AhmedBodyCoarse/processor2/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor2/0/p b/examples/AhmedBodyCoarse/processor2/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/0/p rename to examples/AhmedBodyCoarse/processor2/0/p diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor2/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor2/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor2/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/processor3/0/U b/examples/AhmedBodyCoarse/processor3/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/0/U rename to examples/AhmedBodyCoarse/processor3/0/U diff --git a/python/examples/AhmedBodyCoarse/processor3/0/k b/examples/AhmedBodyCoarse/processor3/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/0/k rename to examples/AhmedBodyCoarse/processor3/0/k diff --git a/python/examples/AhmedBodyCoarse/processor3/0/nut b/examples/AhmedBodyCoarse/processor3/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/0/nut rename to examples/AhmedBodyCoarse/processor3/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor3/0/omega b/examples/AhmedBodyCoarse/processor3/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/0/omega rename to examples/AhmedBodyCoarse/processor3/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor3/0/p b/examples/AhmedBodyCoarse/processor3/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/0/p rename to examples/AhmedBodyCoarse/processor3/0/p diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor3/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor3/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor3/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/processor4/0/U b/examples/AhmedBodyCoarse/processor4/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/0/U rename to examples/AhmedBodyCoarse/processor4/0/U diff --git a/python/examples/AhmedBodyCoarse/processor4/0/k b/examples/AhmedBodyCoarse/processor4/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/0/k rename to examples/AhmedBodyCoarse/processor4/0/k diff --git a/python/examples/AhmedBodyCoarse/processor4/0/nut b/examples/AhmedBodyCoarse/processor4/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/0/nut rename to examples/AhmedBodyCoarse/processor4/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor4/0/omega b/examples/AhmedBodyCoarse/processor4/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/0/omega rename to examples/AhmedBodyCoarse/processor4/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor4/0/p b/examples/AhmedBodyCoarse/processor4/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/0/p rename to examples/AhmedBodyCoarse/processor4/0/p diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor4/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor4/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor4/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/processor5/0/U b/examples/AhmedBodyCoarse/processor5/0/U similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/0/U rename to examples/AhmedBodyCoarse/processor5/0/U diff --git a/python/examples/AhmedBodyCoarse/processor5/0/k b/examples/AhmedBodyCoarse/processor5/0/k similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/0/k rename to examples/AhmedBodyCoarse/processor5/0/k diff --git a/python/examples/AhmedBodyCoarse/processor5/0/nut b/examples/AhmedBodyCoarse/processor5/0/nut similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/0/nut rename to examples/AhmedBodyCoarse/processor5/0/nut diff --git a/python/examples/AhmedBodyCoarse/processor5/0/omega b/examples/AhmedBodyCoarse/processor5/0/omega similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/0/omega rename to examples/AhmedBodyCoarse/processor5/0/omega diff --git a/python/examples/AhmedBodyCoarse/processor5/0/p b/examples/AhmedBodyCoarse/processor5/0/p similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/0/p rename to examples/AhmedBodyCoarse/processor5/0/p diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundary b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundary similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundary rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundary diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundaryProcAddressing b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundaryProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundaryProcAddressing rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/boundaryProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellLevel b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellLevel rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellLevel diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellProcAddressing b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellProcAddressing rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/cellProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faceProcAddressing b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faceProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faceProcAddressing rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/faceProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faces b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faces similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/faces rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/faces diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/level0Edge b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/level0Edge similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/level0Edge rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/level0Edge diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/neighbour b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/neighbour similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/neighbour rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/neighbour diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/owner b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/owner similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/owner rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/owner diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointLevel b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointLevel similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointLevel rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointLevel diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointProcAddressing b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointProcAddressing similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointProcAddressing rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/pointProcAddressing diff --git a/python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/points_orig b/examples/AhmedBodyCoarse/processor5/constant/polyMesh/points_orig similarity index 100% rename from python/examples/AhmedBodyCoarse/processor5/constant/polyMesh/points_orig rename to examples/AhmedBodyCoarse/processor5/constant/polyMesh/points_orig diff --git a/python/examples/AhmedBodyCoarse/run_warp.py b/examples/AhmedBodyCoarse/run_warp.py similarity index 100% rename from python/examples/AhmedBodyCoarse/run_warp.py rename to examples/AhmedBodyCoarse/run_warp.py diff --git a/python/examples/structured/dotprod.py b/examples/structured/dotprod.py similarity index 100% rename from python/examples/structured/dotprod.py rename to examples/structured/dotprod.py diff --git a/python/examples/structured/test.py b/examples/structured/test.py similarity index 100% rename from python/examples/structured/test.py rename to examples/structured/test.py diff --git a/python/examples/unstructured/mdo_tutorial_ustruct.py b/examples/unstructured/mdo_tutorial_ustruct.py similarity index 100% rename from python/examples/unstructured/mdo_tutorial_ustruct.py rename to examples/unstructured/mdo_tutorial_ustruct.py diff --git a/python/MExt.py b/idwarp/MExt.py similarity index 100% rename from python/MExt.py rename to idwarp/MExt.py diff --git a/python/MultiUnstructuredMesh.py b/idwarp/MultiUnstructuredMesh.py similarity index 100% rename from python/MultiUnstructuredMesh.py rename to idwarp/MultiUnstructuredMesh.py diff --git a/python/MultiUnstructuredMesh_C.py b/idwarp/MultiUnstructuredMesh_C.py similarity index 100% rename from python/MultiUnstructuredMesh_C.py rename to idwarp/MultiUnstructuredMesh_C.py diff --git a/python/UnstructuredMesh.py b/idwarp/UnstructuredMesh.py similarity index 100% rename from python/UnstructuredMesh.py rename to idwarp/UnstructuredMesh.py diff --git a/python/UnstructuredMesh_C.py b/idwarp/UnstructuredMesh_C.py similarity index 100% rename from python/UnstructuredMesh_C.py rename to idwarp/UnstructuredMesh_C.py diff --git a/idwarp/__init__.py b/idwarp/__init__.py new file mode 100644 index 0000000..50e865a --- /dev/null +++ b/idwarp/__init__.py @@ -0,0 +1,6 @@ +__version__ = '2.2.0' + +from .UnstructuredMesh import USMesh +from .MultiUnstructuredMesh import MultiUSMesh +from .UnstructuredMesh_C import USMesh_C +from .MultiUnstructuredMesh_C import MultiUSMesh_C diff --git a/python/input_files/Readme.md b/input_files/Readme.md similarity index 100% rename from python/input_files/Readme.md rename to input_files/Readme.md diff --git a/python/__init__.py b/python/__init__.py deleted file mode 100644 index 7114cc3..0000000 --- a/python/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# this file is intentionally left blank diff --git a/python/examples/AhmedBodyCoarse/FFD/bodyFittedFFD.fmt b/python/examples/AhmedBodyCoarse/FFD/bodyFittedFFD.fmt deleted file mode 100644 index f0b8f35..0000000 --- a/python/examples/AhmedBodyCoarse/FFD/bodyFittedFFD.fmt +++ /dev/null @@ -1,9 +0,0 @@ -3 -3 5 6 5 5 6 2 5 6 --0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.010000 0.045000 0.100000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 -0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 0.100000 0.290500 0.481000 0.671500 0.862000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 -0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.049000 0.049000 0.049000 0.049000 0.049000 0.121750 0.121750 0.121750 0.121750 0.121750 0.194500 0.194500 0.194500 0.194500 0.194500 0.267250 0.267250 0.267250 0.267250 0.267250 0.340000 0.340000 0.340000 0.340000 0.340000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 0.862000 1.050000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.040000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.080000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.120000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.160000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 0.200000 -0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 0.049000 0.049000 0.121750 0.089250 0.194500 0.129500 0.267250 0.169750 0.340000 0.210000 \ No newline at end of file diff --git a/python/examples/AhmedBodyCoarse/FFD/globalFFD.fmt b/python/examples/AhmedBodyCoarse/FFD/globalFFD.fmt deleted file mode 100644 index d27634e..0000000 --- a/python/examples/AhmedBodyCoarse/FFD/globalFFD.fmt +++ /dev/null @@ -1,11 +0,0 @@ -4 -3 3 2 3 3 2 3 3 2 3 3 2 --2.000000 -1.000000 0.000000 -2.000000 -1.000000 0.000000 -2.000000 -1.000000 0.000000 -2.000000 -1.000000 0.000000 -2.000000 -1.000000 0.000000 -2.000000 -1.000000 0.000000 -0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.000000 0.050000 0.100000 0.000000 0.050000 0.100000 0.000000 0.050000 0.100000 0.000000 0.050000 0.100000 0.000000 0.050000 0.100000 0.000000 0.050000 0.100000 -0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.100000 0.572000 1.044000 0.100000 0.572000 1.044000 0.100000 0.572000 1.044000 0.100000 0.572000 1.044000 0.100000 0.572000 1.044000 0.100000 0.572000 1.044000 -0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 1.044000 3.022000 5.000000 1.044000 3.022000 5.000000 1.044000 3.022000 5.000000 1.044000 3.022000 5.000000 1.044000 3.022000 5.000000 1.044000 3.022000 5.000000 -0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 1.000000 1.000000 1.000000 -0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 0.500000 \ No newline at end of file diff --git a/python/reg_tests/idwarp_cs_par_reg.ref b/reg_tests/idwarp_cs_par_reg.ref similarity index 100% rename from python/reg_tests/idwarp_cs_par_reg.ref rename to reg_tests/idwarp_cs_par_reg.ref diff --git a/python/reg_tests/idwarp_cs_reg.ref b/reg_tests/idwarp_cs_reg.ref similarity index 100% rename from python/reg_tests/idwarp_cs_reg.ref rename to reg_tests/idwarp_cs_reg.ref diff --git a/python/reg_tests/idwarp_par_reg.ref b/reg_tests/idwarp_par_reg similarity index 100% rename from python/reg_tests/idwarp_par_reg.ref rename to reg_tests/idwarp_par_reg diff --git a/reg_tests/idwarp_par_reg.ref b/reg_tests/idwarp_par_reg.ref new file mode 100644 index 0000000..e613dc5 --- /dev/null +++ b/reg_tests/idwarp_par_reg.ref @@ -0,0 +1,250 @@ ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/co_mesh.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/co_mesh.cgns + -> Number of Zones: 4 +#------------------------------# + Total Volume Nodes : 151900 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 -0.000 -0.000) ( -0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 3881 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 498810.0295599413 1e-08 1e-08 +Sum of vCoords Warped: +@value 511335.543190358 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 206541.6336243159 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: -0.233091541304E-04 AD: 15.6695137262 FD: 15.6695107594 Err(%):-0.1893349991E-04 +DOF: 1 OrigVal: -0.277555756156E-16 AD: -248.035693780 FD: -248.035702523 Err(%): 0.3524875886E-05 +DOF: 2 OrigVal: 0.00000000000 AD:-0.370655196532 FD:-0.370655179432 Err(%):-0.4613241478E-05 +DOF: 3 OrigVal: 0.101817780270E-02 AD: 2.60835761958 FD: 2.60835182133 Err(%):-0.2222951559E-03 +DOF: 4 OrigVal: -0.277555756156E-16 AD: -420.641016122 FD: -420.641031492 Err(%): 0.3653853301E-05 +DOF: 5 OrigVal: 0.208297391190E-01 AD: 2.86269315348 FD: 2.86269317215 Err(%): 0.6524213360E-06 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/o_mesh.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/o_mesh.cgns + -> Number of Zones: 79 +#------------------------------# + Total Volume Nodes : 37615 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 -0.000 -0.000) ( -0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 1239 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 613569.8891866967 1e-08 1e-08 +Sum of vCoords Warped: +@value 626765.9276076123 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 49958.2902986838 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: 0.277372517670E-01 AD: 71.1955289520 FD: 71.1955290135 Err(%): 0.8630245132E-07 +DOF: 1 OrigVal: -0.466645120007E-01 AD: 1.24521826301 FD: 1.24521803282 Err(%):-0.1848626832E-04 +DOF: 2 OrigVal: 0.00000000000 AD: -47.0734298827 FD: -47.0734293817 Err(%):-0.1064381356E-05 +DOF: 3 OrigVal: 0.810425014665E-02 AD: 57.9393546174 FD: 57.9393545952 Err(%):-0.3838022048E-07 +DOF: 4 OrigVal: -0.262209872942E-01 AD: -83.9878328056 FD: -83.9878328127 Err(%): 0.8421455764E-08 +DOF: 5 OrigVal: 0.00000000000 AD: -46.8058593761 FD: -46.8058593498 Err(%):-0.5606342639E-07 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/mdo_tutorial_face_bcs.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': [[[0, 0, 0], [0, 0, 1]]], + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/mdo_tutorial_face_bcs.cgns + -> Number of Zones: 1 +#------------------------------# + Total Volume Nodes : 158457 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 0.000 0.000) ( 0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 3881 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 3198303.754755336 1e-08 1e-08 +Sum of vCoords Warped: +@value 3259645.9807859 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 204966.6005750052 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: 0.344108144756E-10 AD: 27.8615515156 FD: 27.8615518910 Err(%): 0.1347382298E-05 +DOF: 1 OrigVal: -0.236961426481E-06 AD: -59.3626362811 FD: -59.3626357936 Err(%):-0.8212843777E-06 +DOF: 2 OrigVal: 0.00000000000 AD: -7.73833928206 FD: -7.73833959553 Err(%): 0.4050777863E-05 +DOF: 3 OrigVal: 0.547700767590E-01 AD: -32.5589507225 FD: -32.5589507028 Err(%):-0.6040309830E-07 +DOF: 4 OrigVal: -0.235853510364E-06 AD: -110.249870180 FD: -110.249870816 Err(%): 0.5768923420E-06 +DOF: 5 OrigVal: 0.935098870910E-01 AD: 34.9657671165 FD: 34.9657672723 Err(%): 0.4455988337E-06 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/symm_block.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/symm_block.cgns + -> Number of Zones: 3 +#------------------------------# + Total Volume Nodes : 103428 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 0.000 0.000) ( 0.000 1.000 0.000) | +| ( 0.000 0.000 0.000) ( 0.000 0.000 -1.000) | +| ( 0.000 0.000 0.000) ( -1.000 0.000 0.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 1951 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 1772626.679902143 1e-08 1e-08 +Sum of vCoords Warped: +@value 1785588.527425706 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 33945.0635308288 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 1.0000000000000000E-010 + Running AD Version +DOF: 0 OrigVal: 1.10000000000 AD: 3.80431777610 FD: 3.80202104555 Err(%):-0.6038990905E-01 +DOF: 1 OrigVal: 0.00000000000 AD: 1.78083763482 FD: 1.78013862477 Err(%):-0.3925946144E-01 +DOF: 2 OrigVal: 0.00000000000 AD: 2.05626964716 FD: 2.08012829342 Err(%): 1.153595307 +DOF: 3 OrigVal: 1.10000000000 AD: 4.02226068196 FD: 4.01996710245 Err(%):-0.5703841205E-01 +DOF: 4 OrigVal: 0.624000000000E-01 AD: 1.89874518396 FD: 1.89804620766 Err(%):-0.3681931557E-01 +DOF: 5 OrigVal: 0.00000000000 AD: 2.07491391827 FD: 2.09877305559 Err(%): 1.143312255 diff --git a/python/reg_tests/idwarp_reg.ref b/reg_tests/idwarp_reg similarity index 100% rename from python/reg_tests/idwarp_reg.ref rename to reg_tests/idwarp_reg diff --git a/reg_tests/idwarp_reg.ref b/reg_tests/idwarp_reg.ref new file mode 100644 index 0000000..e86517e --- /dev/null +++ b/reg_tests/idwarp_reg.ref @@ -0,0 +1,250 @@ ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/co_mesh.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/co_mesh.cgns + -> Number of Zones: 4 +#------------------------------# + Total Volume Nodes : 151900 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 -0.000 -0.000) ( -0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 3881 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 498810.0295599414 1e-08 1e-08 +Sum of vCoords Warped: +@value 511335.5431903581 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 205483.1981170009 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: -0.233091541304E-04 AD: 17.1758529206 FD: 17.1758519303 Err(%):-0.5765777340E-05 +DOF: 1 OrigVal: -0.277555756156E-16 AD: -410.784702283 FD: -410.784716632 Err(%): 0.3493027564E-05 +DOF: 2 OrigVal: 0.00000000000 AD:-0.477235280836 FD:-0.477235293495 Err(%): 0.2652549170E-05 +DOF: 3 OrigVal: 0.101817780270E-02 AD: 5.51555168972 FD: 5.51554953030 Err(%):-0.3915156885E-04 +DOF: 4 OrigVal: -0.277555756156E-16 AD: -695.363921249 FD: -695.363946475 Err(%): 0.3627661644E-05 +DOF: 5 OrigVal: 0.208297391190E-01 AD: 2.63317985680 FD: 2.63317989177 Err(%): 0.1327951957E-05 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/o_mesh.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/o_mesh.cgns + -> Number of Zones: 79 +#------------------------------# + Total Volume Nodes : 37615 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 -0.000 -0.000) ( -0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 1239 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 613569.8891866968 1e-08 1e-08 +Sum of vCoords Warped: +@value 626765.9276076123 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 52726.61691684423 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: 0.277372517670E-01 AD: 37.7709446404 FD: 37.7709446532 Err(%): 0.3404234781E-07 +DOF: 1 OrigVal: -0.466645120007E-01 AD: 15.0230079541 FD: 15.0230079087 Err(%):-0.3023226495E-06 +DOF: 2 OrigVal: 0.00000000000 AD: -18.3406672297 FD: -18.3406669855 Err(%):-0.1331451278E-05 +DOF: 3 OrigVal: 0.810425014665E-02 AD: 29.5917781041 FD: 29.5917780882 Err(%):-0.5368225200E-07 +DOF: 4 OrigVal: -0.262209872942E-01 AD: -18.8825073304 FD: -18.8825073196 Err(%):-0.5723583676E-07 +DOF: 5 OrigVal: 0.00000000000 AD: -18.1866527158 FD: -18.1866527724 Err(%): 0.3115565911E-06 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/mdo_tutorial_face_bcs.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': [[[0, 0, 0], [0, 0, 1]]], + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/mdo_tutorial_face_bcs.cgns + -> Number of Zones: 1 +#------------------------------# + Total Volume Nodes : 158457 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 0.000 0.000) ( 0.000 0.000 1.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 3881 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 3198303.754755335 1e-08 1e-08 +Sum of vCoords Warped: +@value 3259645.9807859 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 205083.3301401152 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 9.9999999999999995E-007 + Running AD Version +DOF: 0 OrigVal: 0.344108144756E-10 AD: 38.3960793455 FD: 38.3960797061 Err(%): 0.9389686590E-06 +DOF: 1 OrigVal: -0.236961426481E-06 AD: -559.744436903 FD: -559.744436747 Err(%):-0.2782569623E-07 +DOF: 2 OrigVal: 0.00000000000 AD: -18.3231940357 FD: -18.3231941247 Err(%): 0.4854002691E-06 +DOF: 3 OrigVal: 0.547700767590E-01 AD: -35.4790262372 FD: -35.4790264367 Err(%): 0.5621669402E-06 +DOF: 4 OrigVal: -0.235853510364E-06 AD: -956.661871568 FD: -956.661873424 Err(%): 0.1940149683E-06 +DOF: 5 OrigVal: 0.935098870910E-01 AD: 26.5281725177 FD: 26.5281723406 Err(%):-0.6675073981E-06 ++---------------------------------------+ +| All pyWarpUstruct Options: | ++---------------------------------------+ +{'LdefFact': 1.0, + 'aExp': 3.0, + 'alpha': 0.25, + 'bExp': 5.0, + 'bucketSize': 8, + 'cornerAngle': 30.0, + 'errTol': 0.0005, + 'evalMode': 'fast', + 'fileType': 'cgns', + 'gridFile': '../input_files/symm_block.cgns', + 'restartFile': None, + 'specifiedSurfaces': None, + 'symmTol': 1e-06, + 'symmetryPlanes': None, + 'symmetrySurfaces': None, + 'useRotations': True, + 'zeroCornerRotations': True} + -> Reading CGNS File: ../input_files/symm_block.cgns + -> Number of Zones: 3 +#------------------------------# + Total Volume Nodes : 103428 +#------------------------------# + ++------------------------------------------------------------------------------+ +| pyWarpUstruct Warning: Using internally generated pyWarpUStruct surfaces. If | +| this mesh object is to be used with an external solver, ensure the mesh | +| object is passed to the solver immediatedly after it is created. The | +| external solver must then call 'setExternalMeshIndices()' and | +| 'setSurfaceDefinition()' routines. | ++------------------------------------------------------------------------------+ + ++-------------------- Symmetry Planes -------------------+ +| Point Normal | +| ( 0.000 0.000 0.000) ( 0.000 1.000 0.000) | +| ( 0.000 0.000 0.000) ( 0.000 0.000 -1.000) | +| ( 0.000 0.000 0.000) ( -1.000 0.000 0.000) | ++--------------------------------------------------------+ +#--------------------------------# + Unique Surface Nodes : 1951 +#--------------------------------# + Computing Denomenator Estimate... + Load Balancing... + Finished Mesh Initialization. +Sum of vCoords Inital: +@value 1772626.679902143 1e-08 1e-08 +Sum of vCoords Warped: +@value 1785588.527425706 1e-08 1e-08 +Computing Warp Deriv +Sum of dxs: +@value 32295.31100101105 1e-08 1e-08 +Verifying Warp Deriv + Welcome to verifyWarpDeriv + Checking 5 degrees of freedom + Doing centered differnce with h: 1.0000000000000000E-010 + Running AD Version +DOF: 0 OrigVal: 1.10000000000 AD: 2.87055669475 FD: 2.86938666987 Err(%):-0.4076781968E-01 +DOF: 1 OrigVal: 0.00000000000 AD: 1.88269575176 FD: 1.88143477302 Err(%):-0.6699973525E-01 +DOF: 2 OrigVal: 0.00000000000 AD: 2.61198372778 FD: 2.63322409383 Err(%): 0.8098960716 +DOF: 3 OrigVal: 1.10000000000 AD: 2.88621881905 FD: 2.88504902062 Err(%):-0.4053869854E-01 +DOF: 4 OrigVal: 0.624000000000E-01 AD: 1.89116899242 FD: 1.88990801610 Err(%):-0.6669931953E-01 +DOF: 5 OrigVal: 0.00000000000 AD: 2.61332356901 FD: 2.63456397035 Err(%): 0.8094838610 diff --git a/python/reg_tests/mdo_regression_helper.py b/reg_tests/mdo_regression_helper.py similarity index 100% rename from python/reg_tests/mdo_regression_helper.py rename to reg_tests/mdo_regression_helper.py diff --git a/python/reg_tests/run_reg_tests.py b/reg_tests/run_reg_tests.py similarity index 100% rename from python/reg_tests/run_reg_tests.py rename to reg_tests/run_reg_tests.py diff --git a/python/reg_tests/run_reg_tests_cs.py b/reg_tests/run_reg_tests_cs.py similarity index 100% rename from python/reg_tests/run_reg_tests_cs.py rename to reg_tests/run_reg_tests_cs.py diff --git a/python/reg_tests/solve_script.py b/reg_tests/solve_script.py similarity index 100% rename from python/reg_tests/solve_script.py rename to reg_tests/solve_script.py diff --git a/python/reg_tests/solve_script_cs.py b/reg_tests/solve_script_cs.py similarity index 100% rename from python/reg_tests/solve_script_cs.py rename to reg_tests/solve_script_cs.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..add8f0a --- /dev/null +++ b/setup.py @@ -0,0 +1,56 @@ +from setuptools import setup +import re + +__version__ = re.findall( + r"""__version__ = ["']+([0-9\.]*)["']+""", + open('idwarp/__init__.py').read(), +)[0] + +setup(name='idwarp', + version=__version__, + + + description="idwarp is a package deforming volume meshes with derivatives for optimization", + long_description=""" + + # IDWarp + [![Build Status](https://travis-ci.com/mdolab/idwarp.svg?branch=master)](https://travis-ci.com/mdolab/idwarp) + [![Documentation Status](https://readthedocs.com/projects/mdolab-idwarp/badge/?version=latest)](https://mdolab-idwarp.readthedocs-hosted.com/en/latest/?badge=latest) + + + IDWarp uses an inverse distance method to modify the location of mesh volume nodes given a perturbation of the surface nodes. + + ## Documentation + + Please see the [documentation](https://mdolab-idwarp.readthedocs-hosted.com/en/latest/) for installation details and API documentation. + + To locally build the documentation, enter the `doc` folder and enter `make html` in terminal. + You can then view the built documentation in the `_build` folder. + + + ## Citation + + IDWarp is based on the theory presented in [this journal article](https://doi.org/10.1016/j.jcp.2011.09.021). + """, + long_description_content_type="text/markdown", + keywords='mesh-warping warping mesh mesh-deformation optimization', + author='', + author_email='', + url='https://github.com/mdolab/idwarp', + license='Apache License Version 2.0', + packages=[ + 'idwarp', + ], + package_data={ + 'idwarp': ['*.so'] + }, + install_requires=[ + 'numpy>=1.16.4', + 'petsc4py>=3.11.0', + 'mpi4py>=3.0.2', + ], + classifiers=[ + "Operating System :: Linux", + "Programming Language :: Python, Fortran"] + ) + diff --git a/src/f2py/Makefile b/src/f2py/Makefile index 3f6e93b..d8371f0 100644 --- a/src/f2py/Makefile +++ b/src/f2py/Makefile @@ -56,7 +56,7 @@ all: $(FF90) -shared $(PYTHON_OBJECTS) $(LINKER_ALL_FLAGS) -o idwarp.so $(PYTHON) importTest.py - mv idwarp.so ../../python + mv idwarp.so ../../idwarp # Clean up temporary files -rm *.o diff --git a/src_cs/f2py/Makefile b/src_cs/f2py/Makefile index f916fac..abaa32b 100644 --- a/src_cs/f2py/Makefile +++ b/src_cs/f2py/Makefile @@ -45,7 +45,7 @@ all: $(FF90) -shared $(PYTHON_OBJECTS) $(LINKER_ALL_FLAGS) -o idwarp_cs.so $(PYTHON) importTest.py - mv idwarp_cs.so ../../python + mv idwarp_cs.so ../../idwarp # Clean up temporary files -rm *.o