summarylogtreecommitdiffstats
path: root/min-max-conflict.patch
diff options
context:
space:
mode:
authorMichele Mocciciola2016-10-01 17:39:01 +0200
committerMichele Mocciciola2016-10-01 17:39:01 +0200
commit16fc355db4e720c0998c8d89872d75159ea7b92d (patch)
tree67eb528dcaa4d7dcf40b14ef62ed847a7365cab0 /min-max-conflict.patch
parentd5e385d1fd9fcadd7887de97a574ac91083714ee (diff)
downloadaur-16fc355db4e720c0998c8d89872d75159ea7b92d.tar.gz
Updated to gcc-6. Introduced compilation of OpenSeesSP and OpenSeesMP. Executable links to metis-4. Many thanks to nema.arpit for his work.
Diffstat (limited to 'min-max-conflict.patch')
-rw-r--r--min-max-conflict.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/min-max-conflict.patch b/min-max-conflict.patch
new file mode 100644
index 000000000000..e5e3f4259fd4
--- /dev/null
+++ b/min-max-conflict.patch
@@ -0,0 +1,24 @@
+Index: SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp
+===================================================================
+--- SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp (revision 6236)
++++ SRC/system_of_eqn/linearSOE/sparseGEN/DistributedSuperLU.cpp (working copy)
+@@ -31,6 +31,7 @@
+
+ #include <DistributedSuperLU.h>
+ #include <SparseGenColLinSOE.h>
++#include <superlu_ddefs.h>
+ #include <f2c.h>
+ #include <math.h>
+ #include <Channel.h>
+@@ -37,10 +38,10 @@
+ #include <FEM_ObjectBroker.h>
+ #include <ID.h>
+
+-#include <superlu_ddefs.h>
+
+
+
++
+ superlu_options_t options;
+ SuperLUStat_t stat;
+ SuperMatrix A;