From 6764fec21acde01fa9cc80024ab6dfed59c9f3a0cc869a5c03a4a8b7814a79e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 31 May 2015 16:43:02 +0000 Subject: [PATCH] Accepting request 309461 from home:awissu:branches:science OBS-URL: https://build.opensuse.org/request/show/309461 OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=8 --- ccx-2.6-build.patch => ccx-2.8-build.patch | 9 +++-- ...re.patch => ccx-2.8-no-local-compare.patch | 4 +- ...mic.patch => ccx-2.8-spooles-dynamic.patch | 16 ++++---- ccx.changes | 39 +++++++++++++++++++ ccx.spec | 8 ++-- ccx_2.6.doc.tar.bz2 | 3 -- ccx_2.6.src.tar.bz2 | 3 -- ccx_2.6.test.tar.bz2 | 3 -- ccx_2.8p2.doc.tar.bz2 | 3 ++ ccx_2.8p2.src.tar.bz2 | 3 ++ ccx_2.8p2.test.tar.bz2 | 3 ++ 11 files changed, 68 insertions(+), 26 deletions(-) rename ccx-2.6-build.patch => ccx-2.8-build.patch (62%) rename ccx-2.6-no-local-compare.patch => ccx-2.8-no-local-compare.patch (81%) rename ccx-2.0-spooles-dynamic.patch => ccx-2.8-spooles-dynamic.patch (50%) delete mode 100644 ccx_2.6.doc.tar.bz2 delete mode 100644 ccx_2.6.src.tar.bz2 delete mode 100644 ccx_2.6.test.tar.bz2 create mode 100644 ccx_2.8p2.doc.tar.bz2 create mode 100644 ccx_2.8p2.src.tar.bz2 create mode 100644 ccx_2.8p2.test.tar.bz2 diff --git a/ccx-2.6-build.patch b/ccx-2.8-build.patch similarity index 62% rename from ccx-2.6-build.patch rename to ccx-2.8-build.patch index a265592..7084583 100644 --- a/ccx-2.6-build.patch +++ b/ccx-2.8-build.patch @@ -1,9 +1,10 @@ ---- ccx_2.6/src/Makefile.orig 2013-07-09 18:24:33.000000000 +0200 -+++ ccx_2.6/src/Makefile 2013-07-11 22:19:49.515188839 +0200 +diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8p2/src/Makefile +--- ccx_2.8p2.orig/src/Makefile 2015-03-04 21:46:08.000000000 +0300 ++++ ccx_2.8p2/src/Makefile 2015-05-31 19:04:44.335112575 +0300 @@ -1,6 +1,6 @@ -CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE --FFLAGS = -Wall -O3 +-FFLAGS = -Wall -O3 -fopenmp +CFLAGS = -Wall $(GLOBAL_OFLAGS) -g -DARCH="Linux" -DUSE_MT -DSPOOLES -DARPACK -DMATRIXSTORAGE -Wno-unused +FFLAGS = -Wall $(GLOBAL_OFLAGS) -g -Wno-unused -fopenmp @@ -19,4 +20,4 @@ + -larpack -llapack -lblas \ -lpthread -lm -lc - ccx_2.6: $(OCCXMAIN) ccx_2.6.a $(LIBS) + ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a $(LIBS) diff --git a/ccx-2.6-no-local-compare.patch b/ccx-2.8-no-local-compare.patch similarity index 81% rename from ccx-2.6-no-local-compare.patch rename to ccx-2.8-no-local-compare.patch index 9fdb4ef..e40416c 100644 --- a/ccx-2.6-no-local-compare.patch +++ b/ccx-2.8-no-local-compare.patch @@ -18,8 +18,8 @@ # the .frd file # -- /usr/local/bin/ccx_2.6 ${i%.inp} >> $tempfile 2>&1 -+ /usr/bin/ccx_2.6 ${i%.inp} >> $tempfile 2>&1 +- /usr/local/bin/ccx_2.8p2 ${i%.inp} >> $tempfile 2>&1 ++ /usr/bin/ccx_2.8p2 ${i%.inp} >> $tempfile 2>&1 # # check whether the .dat and .dat.ref files exist diff --git a/ccx-2.0-spooles-dynamic.patch b/ccx-2.8-spooles-dynamic.patch similarity index 50% rename from ccx-2.0-spooles-dynamic.patch rename to ccx-2.8-spooles-dynamic.patch index df2ac9a..c2839a7 100644 --- a/ccx-2.0-spooles-dynamic.patch +++ b/ccx-2.8-spooles-dynamic.patch @@ -1,5 +1,6 @@ ---- ccx-2.0/src/cascade.c 2009-08-12 21:54:16.000000000 +0200 -+++ sav/src/cascade.c 2010-02-11 20:02:25.000000000 +0100 +diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/cascade.c CalculiX/ccx_2.8p2/src/cascade.c +--- ccx_2.8p2.orig/src/cascade.c 2015-03-04 21:46:07.000000000 +0300 ++++ ccx_2.8p2/src/cascade.c 2015-05-31 16:37:59.522092453 +0300 @@ -21,9 +21,9 @@ #include @@ -13,12 +14,13 @@ #endif #include "CalculiX.h" ---- ccx-2.0/src/spooles.h 2009-08-12 21:54:17.000000000 +0200 -+++ sav/src/spooles.h 2010-02-11 20:01:18.000000000 +0100 -@@ -21,11 +21,11 @@ - * seperated from CalculiX.h: otherwise everyone would have to include - * the spooles header files +diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/spooles.h CalculiX/ccx_2.8p2/src/spooles.h +--- ccx_2.8p2.orig/src/spooles.h 2015-03-04 21:46:07.000000000 +0300 ++++ ccx_2.8p2/src/spooles.h 2015-05-31 16:39:15.982564896 +0300 +@@ -23,11 +23,11 @@ */ + + #include -#include -#include -#include diff --git a/ccx.changes b/ccx.changes index 39ab0b2..7cb6f96 100644 --- a/ccx.changes +++ b/ccx.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Sun May 31 16:27:13 UTC 2015 - avvissu@yandex.ru + +- Update to 2.8p2: +- Procedures: + * computational Fluid Dynamics based on finite volumes works for + laminar incompressible flow + * for frequency calculations participation factors and relative + effective modal masses are calculated and stored in the .dat + * rayleigh damping (*DAMPING), contact damping and dashpots were + implemented for nonlinear dynamic calculations (*DYNAMIC) + * magnetostatic and inductive heating calculations are available + with the *ELECTROMAGNETICS keyword + * surfaces tied by cyclic symmetry conditions can now also be + face-based + * stiffness of a substructure (= superelement) can be calculated + and stored using the *SUBSTRUCTURE GENERATE and *SUBSTRUCTURE + MATRIX OUTPUT cards +- Elements: + * beams with a pipe section were implemented (= square cross + section with special integration scheme) + * replaced the expandable rigid bodies by mean rotations MPC's + for the app of rotations and/or moments to beams and shells +- Materials: + * a linear elastoplastic material was implemented (additive + decomposition of the total strain) + * a Ciarlet type elastic model for large deformations was + implemented + * a single crystal creep model was implemented +- Output: + * the text underneath *HEADING is stored in the frd-file + * POT, ECD, EMFE and EMFB labels for the output of the electric + potential, electric current density, electric field and + magnetic field into the .frd-file +- Update patches: + * ccx-2.6-build.patch -> ccx-2.8-build.patch + * ccx-2.6-no-local-compare.patch -> ccx-2.8-no-local-compare.patch + * ccx-2.0-spooles-dynamic.patch -> ccx-2.8-spooles-dynamic.patch + ------------------------------------------------------------------- Tue Oct 28 17:49:48 UTC 2014 - avvissu@yandex.ru diff --git a/ccx.spec b/ccx.spec index 6e6b372..97360aa 100644 --- a/ccx.spec +++ b/ccx.spec @@ -17,7 +17,7 @@ Name: ccx -Version: 2.6 +Version: 2.8p2 Release: 0 Summary: An open source finite element package License: GPL-2.0 and BSD-3-Clause and SUSE-Public-Domain @@ -26,10 +26,10 @@ Url: http://www.calculix.de/ Source0: http://www.dhondt.de/ccx_%{version}.src.tar.bz2 Source1: http://www.dhondt.de/ccx_%{version}.doc.tar.bz2 Source2: http://www.dhondt.de/ccx_%{version}.test.tar.bz2 -Patch0: ccx-2.6-build.patch +Patch0: ccx-2.8-build.patch Patch1: ccx-1.2-doc-Makefile.patch -Patch2: ccx-2.6-no-local-compare.patch -Patch3: ccx-2.0-spooles-dynamic.patch +Patch2: ccx-2.8-no-local-compare.patch +Patch3: ccx-2.8-spooles-dynamic.patch Patch4: ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: arpack-ng-devel diff --git a/ccx_2.6.doc.tar.bz2 b/ccx_2.6.doc.tar.bz2 deleted file mode 100644 index 1931b2e..0000000 --- a/ccx_2.6.doc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bf630d59fe558b7fdcdb2428eb86913e1ee7c71f495b19b6e041ab0c268fe90 -size 4044102 diff --git a/ccx_2.6.src.tar.bz2 b/ccx_2.6.src.tar.bz2 deleted file mode 100644 index 063ecb3..0000000 --- a/ccx_2.6.src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88c1b44eb620791263522e84e316e09303e145216ceb767d9de6870ba103c4e0 -size 954235 diff --git a/ccx_2.6.test.tar.bz2 b/ccx_2.6.test.tar.bz2 deleted file mode 100644 index 3afad58..0000000 --- a/ccx_2.6.test.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2c24e5a6a6a5b4948b1b7dd27648bc5a3d799bf1d9b48137d2fbd172c7f2af5 -size 8252898 diff --git a/ccx_2.8p2.doc.tar.bz2 b/ccx_2.8p2.doc.tar.bz2 new file mode 100644 index 0000000..fdf2d3f --- /dev/null +++ b/ccx_2.8p2.doc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68b76149862692f042bb905dba5aa5f19d9dcffa90f7fa570899f159f0d00bf4 +size 4345337 diff --git a/ccx_2.8p2.src.tar.bz2 b/ccx_2.8p2.src.tar.bz2 new file mode 100644 index 0000000..062cf7c --- /dev/null +++ b/ccx_2.8p2.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a21feb1a498b5925ddc9f7f58cb486d930435db4a47d5c583dd73f5160431eb2 +size 919489 diff --git a/ccx_2.8p2.test.tar.bz2 b/ccx_2.8p2.test.tar.bz2 new file mode 100644 index 0000000..cdd3b39 --- /dev/null +++ b/ccx_2.8p2.test.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a859389cb1405a6130e06215715d4aac93b7877825d7d30a78ef3ab1f3df3662 +size 9014544