Pickup dpg-dev and particleset/particlevector.hpp wrapping.

_build_system/build_config.py

@@ -36,6 +36,7 @@ def print_config():
     print(" when needed, the dependency (mfem/hypre/metis) will be installed under " +
           bglb.ext_prefix)
     print(" build mfem : " + ("Yes" if bglb.build_mfem else "No"))
+    print(" build miniapps: " + ("Yes" if bglb.mfem_miniapps else "No"))
     print(" build metis : " + ("Yes" if bglb.build_metis else "No"))
     print(" build hypre : " + ("Yes" if bglb.build_hypre else "No"))
     print(" build libceed : " + ("Yes" if bglb.build_libceed else "No"))
@@ -89,7 +90,7 @@ def initialize_cmd_options(command_obj):
     command_obj.mfem_source = bglb.mfem_source
     command_obj.mfem_branch = ''
     command_obj.mfem_debug = False
-    command_obj.mfem_build_miniapps = False
+    command_obj.mfem_miniapps = True
     command_obj.metis_prefix = ''
     command_obj.hypre_prefix = ''
 
@@ -146,7 +147,7 @@ def initialize_cmd_options(command_obj):
     ('mfem-source=', None, 'Specify mfem source location' +
      'MFEM source directory. Required to run-swig '),
     ('mfem-debug', None, 'Build MFME with MFEM_DEBUG enabled'),
-    ('mfem-build-miniapps', None, 'build MFME Miniapps'),
+    ('mfem-miniapps', None, 'build MFME Miniapps'),
     ('hypre-prefix=', None, 'Specify locaiton of hypre' +
      'libHYPRE.so must exits under <hypre-prefix>/lib'),
     ('metis-prefix=', None, 'Specify locaiton of metis' +
@@ -221,10 +222,14 @@ def process_cmd_options(command_obj, cfs):
                     assert False, str(command_obj) + " does not have " + attr
                 setattr(command_obj, attr, value)
         else:
-            value = cfs.pop(param, "No")
             if not hasattr(command_obj, attr):
                 assert False, str(command_obj) + " does not have " + attr
 
+            if getattr(command_obj, attr):
+                value = cfs.pop(param, "Yes")
+            else:
+                value = cfs.pop(param, "No")
+
             if value.upper() in ("YES", "TRUE", "1"):
                 setattr(command_obj, attr, True)
             else:
@@ -298,7 +303,7 @@ def configure_install(self):
     bglb.run_swig_parallel = bool(self.with_parallel)
 
     bglb.mfem_debug = bool(self.mfem_debug)
-    bglb.mfem_build_miniapps = bool(self.mfem_build_miniapps)
+    bglb.mfem_miniapps = bool(self.mfem_miniapps)
 
     if bglb.build_serial:
         bglb.build_serial = (not bglb.swig_only and not bglb.ext_only)

_build_system/build_mfem.py

@@ -43,7 +43,7 @@ def add_rpath(p, dest):
 
     cmake_opts = {'DBUILD_SHARED_LIBS': '1',
                   'DMFEM_ENABLE_EXAMPLES': '1',
-                  'DMFEM_ENABLE_MINIAPPS': '0',
+                  'DMFEM_ENABLE_MINIAPPS': '1',
                   'DCMAKE_SHARED_LINKER_FLAGS': ldflags,
                   'DMFEM_USE_ZLIB': '1',
                   'DCMAKE_CXX_FLAGS': bglb.cxxstd_flag,
@@ -56,8 +56,8 @@ def add_rpath(p, dest):
     if bglb.mfem_debug:
         cmake_opts['DMFEM_DEBUG'] = 'YES'
 
-    if bglb.mfem_build_miniapps:
-        cmake_opts['DMFEM_ENABLE_MINIAPPS'] = '1'
+    if not bglb.mfem_miniapps:
+        cmake_opts['DMFEM_ENABLE_MINIAPPS'] = '0'
 
     if bglb.verbose:
         cmake_opts['DCMAKE_VERBOSE_MAKEFILE'] = '1'

_build_system/build_pymfem.py

@@ -71,6 +71,7 @@ def write_setup_local():
               'gslibpinc': os.path.join(bglb.gslibp_prefix, 'include'),
               'cxxstdflag': bglb.cxxstd_flag,
               'build_mfem': '1' if bglb.build_mfem else '0',
+              'build_miniapps': '1' if bglb.mfem_miniapps else '0',
               'bdist_wheel_dir': bglb.bdist_wheel_dir,
               }
 

docs/changelog.txt

@@ -2,6 +2,14 @@
 2025 12
      * PyMFEM4.9
 	- ordering.i is added and made correponding adjustment in *.i files.
+	- update ex22, ex22p to save ComplexGridFunction as is
+	- fixed ParComplexGridFunction::Save wrapping
+	- fixed GetDataArray of Vector/DenseMatrix/DenseTensor/SparseMatrix so that
+	  destructore is not pre-maturely called when return value is not stored to
+	  a variable.
+	- particleset.hpp, particlevector.hpp wrapper
+	- miniapp/dpg/utils/*.hpp is wrapped.
+	- Python version of pmaxwell.py in miniapp/dpg directory
 
 2025 09
       * PyMFEM 4.8

mfem/_par/blockoperator.i

@@ -76,9 +76,15 @@ if len(args) == 2:
   mfem::SparseMatrix *Opr2SparseMat(mfem::Operator *op) {
     return dynamic_cast<mfem::SparseMatrix*>(op);
   }
+  mfem::SparseMatrix *Opr2SparseMatrix(mfem::Operator *op) {
+    return dynamic_cast<mfem::SparseMatrix*>(op);
+  }
   mfem::HypreParMatrix *Opr2HypreParMat(mfem::Operator *op) {
     return dynamic_cast<mfem::HypreParMatrix*>(op);
   }
+  mfem::HypreParMatrix *Opr2HypreParMatrix(mfem::Operator *op) {
+    return dynamic_cast<mfem::HypreParMatrix*>(op);
+  }
 
 %}
 %include "linalg/blockoperator.hpp"

mfem/_par/blockstaticcond.i

@@ -0,0 +1,46 @@
+%module(package="mfem._par") blockstaticcond
+%{
+#include "mfem.hpp"
+#include "numpy/arrayobject.h"
+#include "miniapps/dpg/util/blockstaticcond.hpp"
+#include "../common/pyoperator.hpp"
+#include "../common/pysolvers.hpp"
+#include "../common/pycoefficient.hpp"
+#include "../common/pyintrules.hpp"
+#include "../common/pybilininteg.hpp"
+#include "../common/pynonlininteg.hpp"
+#include "../common/io_stream.hpp"
+%}
+
+%include "../common/existing_mfem_headers.i"
+#ifdef FILE_EXISTS_MINIAPPS_DPG_UTIL_BLOCKSTATICCOND
+
+%init %{
+import_array();
+%}
+
+%inline %{
+#include "miniapps/dpg/util/blockstaticcond.cpp"  
+%}
+
+
+%include "exception.i"
+%import "element.i"
+%import "../common/exception.i"
+
+%import "array.i"
+%import "vector.i"
+%import "densemat.i"
+%import "operators.i"
+%import "blockmatrix.i"
+%import "blockoperator.i"
+%import "fespace.i"
+%import "../common/exception.i"
+%import "../common/io_stream_typemap.i"
+
+OSTREAM_TYPEMAP(std::ostream&)
+
+%ignore mfem::BlockStaticCondensation::ConvertListToReducedTrueDofs;
+%include "miniapps/dpg/util/blockstaticcond.hpp"
+
+#endif

mfem/_par/complex_densemat.i

@@ -0,0 +1,30 @@
+%module(package="mfem._par") complex_densemat
+%{
+#include "mfem.hpp"
+#include "numpy/arrayobject.h"
+#include "../common/pyoperator.hpp"
+#include "../common/pysolvers.hpp"
+#include "../common/pycoefficient.hpp"
+#include "../common/pyintrules.hpp"
+#include "../common/pybilininteg.hpp"
+#include "../common/pynonlininteg.hpp"
+#include "../common/io_stream.hpp"
+%}
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%import "element.i"
+%import "../common/exception.i"
+
+%import "array.i"
+%import "vector.i"
+%import "densemat.i"
+%import "complex_operator.i"
+%import "../common/exception.i"
+%import "../common/io_stream_typemap.i"
+
+%ignore mfem::ComplexLUFactors::Mult(int m, int n, std::complex<real_t> *X) const;
+%include "linalg/complex_densemat.hpp"

mfem/_par/complexstaticcond.i

@@ -0,0 +1,48 @@
+%module(package="mfem._par") complexstaticcond
+%{
+#include "mfem.hpp"
+#include "numpy/arrayobject.h"
+#include "miniapps/dpg/util/complexstaticcond.hpp"
+#include "../common/pyoperator.hpp"
+#include "../common/pysolvers.hpp"
+#include "../common/pycoefficient.hpp"
+#include "../common/pyintrules.hpp"
+#include "../common/pybilininteg.hpp"
+#include "../common/pynonlininteg.hpp"
+#include "../common/io_stream.hpp"
+%}
+
+%include "../common/existing_mfem_headers.i"
+#ifdef FILE_EXISTS_MINIAPPS_DPG_UTIL_COMPLEXSTATICCOND
+
+%init %{
+import_array();
+%}
+
+%inline %{
+#include "miniapps/dpg/util/complexstaticcond.cpp"
+%}
+
+
+%include "exception.i"
+%import "element.i"
+%import "../common/exception.i"
+
+%import "array.i"
+%import "vector.i"
+%import "gridfunc.i"
+%import "mesh.i"
+%import "solvers.i"
+%import "operators.i"
+%import "blockmatrix.i"
+%import "blockoperator.i"
+%import "complex_densemat.i"
+%import "../common/exception.i"
+%import "../common/io_stream_typemap.i"
+
+OSTREAM_TYPEMAP(std::ostream&)
+
+%ignore mfem::ComplexBlockStaticCondensation::ConvertListToReducedTrueDofs;
+%include "miniapps/dpg/util/complexstaticcond.hpp"
+
+#endif

mfem/_par/complexweakform.i

@@ -0,0 +1,65 @@
+%module(package="mfem._par") complexweakform
+%{
+#include "mfem.hpp"
+#include "numpy/arrayobject.h"
+#include "miniapps/dpg/util/complexweakform.hpp"
+#include "../common/pyoperator.hpp"
+#include "../common/pysolvers.hpp"
+#include "../common/pycoefficient.hpp"
+#include "../common/pyintrules.hpp"
+#include "../common/pylininteg.hpp"  
+#include "../common/pybilininteg.hpp"
+#include "../common/pynonlininteg.hpp"
+#include "../common/io_stream.hpp"
+%}
+
+%include "../common/existing_mfem_headers.i"
+#ifdef FILE_EXISTS_MINIAPPS_DPG_UTIL_COMPLEXWEAKFORM
+
+%init %{
+import_array();
+%}
+
+%inline %{
+#include "miniapps/dpg/util/complexweakform.cpp"
+%}
+
+
+%include "exception.i"
+%import "element.i"
+%import "../common/exception.i"
+
+%import "coefficient.i"
+%import "gridfunc.i"
+%import "mesh.i"
+%import "solvers.i"
+%import "operators.i"
+%import "blockmatrix.i"
+%import "../common/exception.i"
+%import "../common/io_stream_typemap.i"
+
+OSTREAM_TYPEMAP(std::ostream&)
+
+%import "../common/object_array_typemap.i"
+LIST_TO_MFEMOBJ_ARRAY_IN(const mfem::Array<mfem::FiniteElementSpace*>&,
+			 mfem::FiniteElementSpace*)
+LIST_TO_MFEMOBJ_ARRAY_IN(const mfem::Array<mfem::FiniteElementCollection*>&,
+			 mfem::FiniteElementCollection*)
+
+
+%pythonprepend mfem::ComplexDPGWeakForm::ComplexDPGWeakForm %{
+  if len(args) > 0:
+     fes_, fecol_ = args
+     self._fes = fes_
+     self._fecol = fecol_
+%}
+
+%pythonprepend mfem::ComplexDPGWeakForm::SetSpaces %{
+  self._fes = fes_
+  self._fecol = fecol_
+%}
+
+
+%include "miniapps/dpg/util/complexweakform.hpp"
+
+#endif

mfem/_par/densemat.i

@@ -124,6 +124,21 @@ def __getitem__(self, *args):
      return _densemat.DenseTensor___getitem__(self, check)
 %}
 
+%typemap(out) PyObject* mfem::DenseMatrix::GetDataArray() {
+     // assign self to base object 
+     Py_INCREF($self); 
+     PyArray_SetBaseObject((PyArrayObject *) $1, $self);
+
+     $result = $1;
+}
+%typemap(out) PyObject* mfem::DenseTensor::GetDataArray() {
+     // assign self to base object 
+     Py_INCREF($self); 
+     PyArray_SetBaseObject((PyArrayObject *) $1, $self);
+
+     $result = $1;
+}
+
 %include "linalg/densemat.hpp"
 
 %extend mfem::DenseMatrix {

mfem/_par/dpg.i

@@ -0,0 +1,51 @@
+%module(package="mfem._par") dpg
+
+%feature("autodoc", "1");
+
+%{
+#include "mfem.hpp"
+#include "numpy/arrayobject.h"
+#include "../common/pyoperator.hpp"
+#include "../common/pysolvers.hpp"
+#include "../common/pycoefficient.hpp"
+#include "../common/pyintrules.hpp"
+#include "../common/pylininteg.hpp"
+#include "../common/pybilininteg.hpp"
+#include "../common/pynonlininteg.hpp"
+#include "../common/io_stream.hpp"
+using namespace mfem;
+%}
+
+%include "../common/existing_mfem_headers.i"
+#ifdef FILE_EXISTS_MINIAPPS_DPG_UTIL_WEAKFORM
+
+
+%init %{
+import_array();
+%}
+
+%include "exception.i"
+%include "../common/exception.i"
+
+%inline %{
+#include "miniapps/dpg/util/pml.cpp"
+#include "miniapps/dpg/util/blockstaticcond.cpp"
+#include "miniapps/dpg/util/complexstaticcond.cpp"
+#include "miniapps/dpg/util/weakform.cpp"
+#include "miniapps/dpg/util/complexweakform.cpp"
+#include "miniapps/dpg/util/pweakform.cpp"
+#include "miniapps/dpg/util/pcomplexweakform.cpp"
+%}
+
+%include "../common/dpg_common.i"
+
+%include "miniapps/dpg/util/pml.hpp"
+%include "miniapps/dpg/util/blockstaticcond.hpp"
+%include "miniapps/dpg/util/complexstaticcond.hpp"
+%include "miniapps/dpg/util/weakform.hpp"
+%include "miniapps/dpg/util/complexweakform.hpp"
+%include "miniapps/dpg/util/pweakform.hpp"
+%include "miniapps/dpg/util/pcomplexweakform.hpp"
+
+
+#endif

mfem/_par/fe_coll.i

@@ -33,6 +33,13 @@ import_array1(-1);
 %import "eltrans.i"
 %import "lininteg.i"
 
+/* define FiniteElementCollectionPtrArray */
+%import "../common/array_listtuple_typemap.i"
+ARRAY_LISTTUPLE_INPUT_SWIGOBJ(mfem::FiniteElementCollection *, 1)
+%import "../common/array_instantiation_macro.i"
+IGNORE_ARRAY_METHODS(mfem::FiniteElementCollection *)
+INSTANTIATE_ARRAY0(FiniteElementCollection *, FiniteElementCollection, 1)
+
 %include "fem/fe_coll.hpp"
 %pythoncode %{
   DG_FECollection = L2_FECollection