Fix for Issue #133, with respect to active interface nodes for during assebly of matrix

tcaduser · tcaduser · commit 5d7e0b60e8e2 · 2024-03-22T18:53:35.000-05:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,10 @@
 
 Please see the release notes in ``doc/devsim.pdf`` or at [https://devsim.net](https://devsim.net) for more detailed information about changes.
 
+## Version 2.7.3
+
+Fixed issue [#133](https://github.com/devsim/devsim/issues/133) identified by [k@yh-kwok](https://github.com/@yh-kwok).
+
 ## Version 2.7.2
 
 * macOS package is now Universal.  Both `x86_64` and `arm64` will use `clang` compiler and macOS 12.0 is now the minimum supported version.
@@ -26,7 +30,7 @@ More helpful exception information returned to python if the error is considered
 
 ### Bugs
 
-Fixed issue [#123](https://github.com/devsim/devsim/issues/123) identified by [@gluek](https://github.com/gluek) This resulted in bad results on Windows and macOS in calculation of 3d mesh areas and volumes.
+Fixed issue [#123](https://github.com/devsim/devsim/issues/123) identified by [@gluek](https://github.com/gluek). This resulted in bad results on Windows and macOS in calculation of 3d mesh areas and volumes.
 
 ## Version 2.6.4
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/${DEVSIM_CONFIG}.cmake OPTIONAL)
 INCLUDE(${PROJECT_SOURCE_DIR}/local.cmake OPTIONAL)
 
 #also change this in setup.cfg
-ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.7.2\")
+ADD_DEFINITIONS(-DDEVSIM_VERSION_STRING=\"2.7.3\")
 ADD_DEFINITIONS(-DDEVSIM_COPYRIGHT_YEAR=\"2009-2024\")
 
 IF (DEVSIM_MATERIALDB)
diff --git a/dist/bdist_wheel/setup.cfg b/dist/bdist_wheel/setup.cfg
@@ -2,7 +2,7 @@
 py-limited-api = cp37
 #plat-name=
 [metadata]
-version = 2.7.2
+version = 2.7.3
 classifiers =
         Development Status :: 5 - Production/Stable
         Intended Audience :: Science/Research
diff --git a/src/Equation/InterfaceEquation.cc b/src/Equation/InterfaceEquation.cc
@@ -432,7 +432,7 @@ void InterfaceEquation<DoubleType>::NodeVolumeType1Assemble(const std::string &i
                 const Node *node0 = nodes0[i];
                 const Node *node1 = nodes1[i];
 
-                if (!(activeNodes0.count(node0)) && (activeNodes1.count(node1)))
+                if (!(activeNodes0.count(node0) && (activeNodes1.count(node1))))
                 {
                   continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ void InterfaceEquation<DoubleType>::NodeVolumeType1Assemble(const std::string &i`
`432`	`432`	`const Node *node0 = nodes0[i];`
`433`	`433`	`const Node *node1 = nodes1[i];`
`434`	`434`
`435`		`- if (!(activeNodes0.count(node0)) && (activeNodes1.count(node1)))`
	`435`	`+ if (!(activeNodes0.count(node0) && (activeNodes1.count(node1))))`
`436`	`436`	`{`
`437`	`437`	`continue;`
`438`	`438`	`}`