fixed nonlinearform and bilinearform wrapper addressed some API changes

mfem · Nov 18, 2023 · 60b3654 · 60b3654
1 parent 700bcf7
commit 60b3654
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/mfem/_par/bilinearform.i b/mfem/_par/bilinearform.i
@@ -75,6 +75,7 @@ namespace mfem {
    %} 
 %pythonprepend MixedBilinearForm::AddDomainIntegrator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    bfi = args[0]
     self._integrators.append(bfi)
     bfi.thisown=0
    %}
@@ -93,7 +94,8 @@ namespace mfem {
     if not hasattr(self, "_integrators"): self._integrators = []
     bfi = args[0]	     
     self._integrators.append(bfi)
-    bfi.thisown=0
+    self.UseExternalIntegrators()
+    #bfi.thisown=0
    %} 
 %pythonappend MixedBilinearForm::SpMat %{
     if not hasattr(self, "_spmat"): self._spmat = []
@@ -102,11 +104,13 @@ namespace mfem {
    %}
 %pythonprepend DiscreteLinearOperator::AddDomainInterpolator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    di = args[0]
     self._integrators.append(di)
     di.thisown=0
    %} 
 %pythonprepend DiscreteLinearOperator::AddTraceFaceInterpolator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    di = args[0]
     self._integrators.append(di)
     di.thisown=0
    %}

diff --git a/mfem/_par/nonlinearform.i b/mfem/_par/nonlinearform.i
@@ -23,6 +23,7 @@ import_array();
 namespace mfem { 
 %pythonprepend NonlinearForm::AddDomainIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
+    nlfi = args[0]	     
 #    self._integrators.append(nlfi)
     nlfi.thisown=0 
 %}
@@ -33,13 +34,14 @@ namespace mfem {
 %}
 %pythonprepend NonlinearForm::AddBdrFaceIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
+    nlfi = args[0]     
 #    self._integrators.append(nlfi)
-    nlfi = args[0]
     nlfi.thisown=0 
 %}
 %pythonprepend BlockNonlinearForm::AddDomainIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
-#    self._integrators.append(nlfi)
+    nlfi = args[0]
+#    self._integrators.append(nlfi)      
     nlfi.thisown=0 
 %}
 %pythonprepend BlockNonlinearForm::AddInteriorFaceIntegrator %{
@@ -49,8 +51,8 @@ namespace mfem {
 %}
 %pythonprepend BlockNonlinearForm::AddBdrFaceIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
+    nlfi = args[0]	     
 #    self._integrators.append(nlfi)
-    nlfi = args[0]
     nlfi.thisown=0 
 %}
 }

diff --git a/mfem/_ser/bilinearform.i b/mfem/_ser/bilinearform.i
@@ -75,6 +75,7 @@ namespace mfem {
    %} 
 %pythonprepend MixedBilinearForm::AddDomainIntegrator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    bfi = args[0]
     self._integrators.append(bfi)
     bfi.thisown=0
    %}
@@ -103,11 +104,13 @@ namespace mfem {
    %}
 %pythonprepend DiscreteLinearOperator::AddDomainInterpolator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    di = args[0]
     self._integrators.append(di)
     di.thisown=0
    %} 
 %pythonprepend DiscreteLinearOperator::AddTraceFaceInterpolator %{
     if not hasattr(self, "_integrators"): self._integrators = []
+    di = args[0]
     self._integrators.append(di)
     di.thisown=0
     %}

diff --git a/mfem/_ser/nonlinearform.i b/mfem/_ser/nonlinearform.i
@@ -26,6 +26,7 @@ import_array();
 namespace mfem { 
 %pythonprepend NonlinearForm::AddDomainIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
+    nlfi = args[0]	     
 #    self._integrators.append(nlfi)
     nlfi.thisown=0 
 %}
@@ -36,13 +37,14 @@ namespace mfem {
 %}
 %pythonprepend NonlinearForm::AddBdrFaceIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
-#    self._integrators.append(nlfi)
     nlfi = args[0]
+#    self._integrators.append(nlfi)	     
     nlfi.thisown=0 
 %}
 %pythonprepend BlockNonlinearForm::AddDomainIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
-#    self._integrators.append(nlfi)
+    nlfi = args[0]
+#    self._integrators.append(nlfi)	     
     nlfi.thisown=0 
 %}
 %pythonprepend BlockNonlinearForm::AddInteriorFaceIntegrator %{
@@ -52,8 +54,8 @@ namespace mfem {
 %}
 %pythonprepend BlockNonlinearForm::AddBdrFaceIntegrator %{
 #    if not hasattr(self, "_integrators"): self._integrators = []
+    nlfi = args[0]	     
 #    self._integrators.append(nlfi)
-    nlfi = args[0]
     nlfi.thisown=0 
 %}
 }