Merge remote-tracking branch 'origin/mfem_46_dev' into macos_build_debug

mfem/__init__.py

@@ -20,5 +20,5 @@ def debug_print(message):
 
     print(message)
 
-__version__ = '4.5.2.1'
+__version__ = '4.6.0.0rc1'
 

mfem/_par/bilinearform.i

@@ -28,6 +28,8 @@ import_array();
 %import "bilininteg.i"
 %import "linearform.i"
 %import "gridfunc.i"
+%import "staticcond.i"
+%import "hybridization.i"
 %include "../common/exception_director.i"
 
 %feature("director") mfem::BilinearForm;

mfem/_par/doftrans.i

@@ -1,6 +1,6 @@
 %module(package="mfem._par") doftrans
 %{
-#include  "mfem.hpp"
+#include "mfem.hpp"
 #include "pyoperator.hpp"      
 #include "numpy/arrayobject.h"    
 %}
@@ -9,7 +9,8 @@
 import_array();
 %}
 %include "exception.i"
-%import "fe.i"
+%import "vector.i"
+%import "densemat.i"
 %import "intrules.i"
 %include "../common/typemap_macros.i"
 %include "../common/exception.i"

mfem/_par/fe_base.i

@@ -11,6 +11,7 @@ import_array();
 %include "exception.i"
 %import "intrules.i"
 %import "geom.i"
+%import "doftrans.i"
 %include "../common/typemap_macros.i"
 %include "../common/exception.i"
 

mfem/_par/setup.py

@@ -119,7 +119,8 @@ def get_extensions():
                "transfer", "dist_solver", "std_vectors", "auxiliary",
                "tmop", "tmop_amr", "tmop_tools", "qspace", "qfunction",
                "quadinterpolator", "quadinterpolator_face",
-               "submesh", "transfermap", "psubmesh", "ptransfermap"]
+               "submesh", "transfermap", "staticcond","sidredatacollection",
+               "psubmesh", "ptransfermap"]
 
     if add_pumi == '1':
         from setup_local import puminc, pumilib

mfem/_par/sidredatacollection.i

@@ -0,0 +1,16 @@
+%module(package="mfem._par")  sidredatacollection
+%{
+#include "mfem.hpp"  
+#include "pyoperator.hpp"        
+#include "numpy/arrayobject.h"
+#include "../common/pycoefficient.hpp"  
+%}
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%import "datacollection.i"
+
+%include "fem/sidredatacollection.hpp"

mfem/_par/solvers.i

@@ -28,6 +28,7 @@ import_array();
 %import "operators.i"
 %import "matrix.i"
 %import "sparsemat.i"
+%import "hypre.i"
 %import "../common/exception.i"
 
 %ignore mfem::IterativeSolverMonitor::SetIterativeSolver;

mfem/_par/staticcond.i

@@ -0,0 +1,17 @@
+%module(package="mfem._par")  staticcond
+%{
+#include "mfem.hpp"  
+#include "pyoperator.hpp"        
+#include "numpy/arrayobject.h"
+#include "../common/pycoefficient.hpp"  
+%}
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%import "fespace.i"
+%import "pfespace.i"
+
+%include "fem/staticcond.hpp"

mfem/_ser/bilinearform.i

@@ -27,6 +27,8 @@ import_array();
 %import "bilininteg.i"
 %import "linearform.i"
 %import "gridfunc.i"
+%import "hybridization.i"
+%import "staticcond.i"
 %include "../common/exception_director.i"
 
 %feature("director") mfem::BilinearForm;

mfem/_ser/doftrans.i

@@ -9,7 +9,8 @@
 import_array();
 %}
 %include "exception.i"
-%import "fe.i"
+%import "vector.i"
+%import "densemat.i"
 %import "intrules.i"
 %include "../common/typemap_macros.i"
 %include "../common/exception.i"

mfem/_ser/fe_base.i

@@ -11,6 +11,7 @@ import_array();
 %include "exception.i"
 %import "intrules.i"
 %import "geom.i"
+%import "doftrans.i"
 %include "../common/typemap_macros.i"
 %include "../common/exception.i"
 

mfem/_ser/setup.py

@@ -101,7 +101,7 @@ def get_extensions():
                "transfer", "std_vectors",
                "tmop", "tmop_amr", "tmop_tools", "qspace", "qfunction",
                "quadinterpolator", "quadinterpolator_face",
-               "submesh", "transfermap"]
+               "submesh", "transfermap", "staticcond", "sidredatacollection"]
 
     if add_cuda == '1':
         from setup_local import cudainc

mfem/_ser/sidredatacollection.i

@@ -0,0 +1,16 @@
+%module(package="mfem._ser")  sidredatacollection
+%{
+#include "mfem.hpp"  
+#include "pyoperator.hpp"        
+#include "numpy/arrayobject.h"
+#include "../common/pycoefficient.hpp"  
+%}
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%import "datacollection.i"
+
+%include "fem/sidredatacollection.hpp"

mfem/_ser/staticcond.i

@@ -0,0 +1,16 @@
+%module(package="mfem._ser")  staticcond
+%{
+#include "mfem.hpp"  
+#include "pyoperator.hpp"        
+#include "numpy/arrayobject.h"
+#include "../common/pycoefficient.hpp"  
+%}
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%import "fespace.i"
+
+%include "fem/staticcond.hpp"

setup.py

@@ -58,9 +58,9 @@
          "gklib": "https://github.com/KarypisLab/GKlib",
          "metis": "https://github.com/KarypisLab/METIS", }
 repos_sha = {
-    # "mfem": "2f6eb8838f8f5e8359abba0dd3434c8cc7147012",
-    #"mfem": "00b2a0705f647e17a1d4ffcb289adca503f28d42", # version 4.5.2
-    "mfem": "962774d5ffa84ceed3bc670e52388250ee028da1",  # version 4.5.2 + distsolve
+    # "mfem": "00b2a0705f647e17a1d4ffcb289adca503f28d42", # version 4.5.2
+    # "mfem": "962774d5ffa84ceed3bc670e52388250ee028da1",  # version 4.5.2 + distsolve
+    "mfem": "69fbae732d5279c8d0f42c5430c4fd5656731d00", # version 4.6
     "gklib": "a7f8172703cf6e999dd0710eb279bba513da4fec",
     "metis": "94c03a6e2d1860128c2d0675cbbb86ad4f261256", }