Accepting request 1136173 from science

OBS-URL: https://build.opensuse.org/request/show/1136173 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ccx?expand=0&rev=3
Accepting request 1001043 from science
2024-01-03 11:30:05 +00:00 · 2022-09-03 21:19:26 +00:00
8 changed files with 1 additions and 164 deletions
--- a/0001-Add-missing-argument-for-inputerror-function-call.patch
+++ b/0001-Add-missing-argument-for-inputerror-function-call.patch
@ -1,25 +0,0 @@
-From d72c6c52d1a4535bb04e24b09f02bf52a990eb39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 30 Jan 2022 16:06:47 +0100
-Subject: [PATCH] Add missing argument for inputerror function call
-
---
- src/crackpropagations.f | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/crackpropagations.f b/src/crackpropagations.f
-index 5b1dfbe..e5a03c5 100644
--- a/src/crackpropagations.f
-+++ b/src/crackpropagations.f
-@@ -120,7 +120,7 @@
-         write(*,*) '         ',
-      &       textpart(i)(1:index(textpart(i),' ')-1)
-         call inputerror(inpc,ipoinpc,iline,
-     &       "*CRACK PROPAGATION%")
-+     &       "*CRACK PROPAGATION%",ier)
-       endif
- !
- !     check for the existence of the material
-- 
-2.34.1
-
--- a/0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch
+++ b/0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch
@ -1,35 +0,0 @@
-From 59b0a4eca5ea6efd138a708fc5ba4b98a499b2d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 30 Jan 2022 17:37:38 +0100
-Subject: [PATCH] Fix wrong parameter passed to us3_materialdata_me
-
-GCC 11.2 errors out as the last parameter is syntactically wrong, and
-apparently also semantically:
-
-resultsmech_us3.f:465:18:
-   353 |      &           xstiff,ncmat_)
-       |                        2
- ......
-   465 |      &     xstiff,alcon)
-       |                  1
-Error: Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/INTEGER(4)).
---
- src/resultsmech_us3.f | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/resultsmech_us3.f b/src/resultsmech_us3.f
-index bf1757b..78c8f17 100644
--- a/src/resultsmech_us3.f
-+++ b/src/resultsmech_us3.f
-@@ -462,7 +462,7 @@
-      &     ihyper,istiff,elconloc,eth,kode,plicon,
-      &     nplicon,plkcon,nplkcon,npmat_,
-      &     plconloc,mi(1),dtime,k,
-     &     xstiff,alcon)
-+     &     xstiff,ncmat_)
-           e     = elas(1)
-           un    = elas(2)
-           rho   = rhcon(1,1,imat)        
-- 
-2.34.1
-
--- a/0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch
+++ b/0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch
@ -1,29 +0,0 @@
-From 5b272a99dfd8726be69f8515c8406a5423019f5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 30 Jan 2022 17:48:27 +0100
-Subject: [PATCH] Fix wrong scalar declaration for 2x2 inverse Jacobian
-
-us4_sub.f:494:42:
-  494 |         call us4_Ni(ri,si,X,Nrs,dNr,dNs,Jm,invJm,detJm,detinvJm,dNx,dNy) ! s4 interpolation
-      |                                           1
-Error: Rank mismatch in argument 'invjm' at (1) (rank-2 and scalar)
---
- src/us4_sub.f | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/us4_sub.f b/src/us4_sub.f
-index 7305d6b..36d77f7 100644
--- a/src/us4_sub.f
-+++ b/src/us4_sub.f
-@@ -454,7 +454,7 @@
-       REAL*8, INTENT(IN)  :: X(4,3),rho,h             
-       REAL*8, INTENT(OUT) :: M(24,24) 
-       REAL*8 :: ri,si,Nrs(4),dNr(4),dNs(4),Jm(2,2)
-      REAL*8 :: invJm,detJm,detinvJm,dNx(4),dNy(4),q1
-+      REAL*8 :: invJm(2,2),detJm,detinvJm,dNx(4),dNy(4),q1
-       REAL*8 :: m_3t(6,6), N_u(6,24),g_p(4,3)
-       INTEGER :: k,j
-       !
-- 
-2.34.1
-
--- a/0001-Fixup-spooles-include-dir.patch
+++ b/0001-Fixup-spooles-include-dir.patch
@ -5,9 +5,8 @@ Subject: [PATCH] Fixup spooles include dir

 ---
 src/cascade.c    | 6 +++---
- src/cascadefem.c | 6 +++---
 src/spooles.h    | 8 ++++----
- 3 files changed, 10 insertions(+), 10 deletions(-)
+ 2 files changed, 7 insertions(+), 7 deletions(-)

 diff --git a/src/cascade.c b/src/cascade.c
 index 796d5cf..c996f12 100644
@ -25,23 +24,6 @@ index 796d5cf..c996f12 100644
 +#include <spooles/SymbFac.h>
 #endif
 
- #include "CalculiX.h"
-diff --git a/src/cascadefem.c b/src/cascadefem.c
-index 308960c..578d4e3 100755
--- a/src/cascadefem.c
-+++ b/src/cascadefem.c
-@@ -21,9 +21,9 @@
- #include <string.h>
- 
- #ifdef SPOOLES
-#include <misc.h>
-#include <FrontMtx.h>
-#include <SymbFac.h>
-+#include <spooles/misc.h>
-+#include <spooles/FrontMtx.h>
-+#include <spooles/SymbFac.h>
- #endif
- 
 #include "CalculiX.h"
 diff --git a/src/spooles.h b/src/spooles.h
 index 388f1ff..6966215 100755
--- a/0001-Pass-rank-1-dummy-for-auxiliary-array-in-isortii.patch
+++ b/0001-Pass-rank-1-dummy-for-auxiliary-array-in-isortii.patch
@ -1,27 +0,0 @@
-From 1a7801c596a2649a198779ff513627f3007b38bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Thu, 14 Jul 2022 18:19:33 +0200
-Subject: [PATCH] Pass rank-1 dummy for auxiliary array in isortii
-
-Passing an scalar in place of a (dummy) rank-1 array is invalid
-according to the Fortran standard.
---
- src/gencontelem_n2f.f | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gencontelem_n2f.f b/src/gencontelem_n2f.f
-index eef6205..280b495 100644
--- a/src/gencontelem_n2f.f
-+++ b/src/gencontelem_n2f.f
-@@ -37,7 +37,7 @@
- !
-       integer ntie,ifree,nasym,icutb,ne0,mortar,jqw(*),iroww(*),
-      &  itietri(2,ntie),ipkon(*),kon(*),koncont(4,*),ne,node,
-     &  neigh(1),iflag,kneigh,i,j,k,l,isol,iset,idummy,
-+     &  neigh(1),iflag,kneigh,i,j,k,l,isol,iset,idummy(1),
-      &  itri,ll,kflag,n,nx(*),ny(*),istep,iinc,mi(*),nzsw,
-      &  nz(*),nstart,ielmat(mi(3),*),imat,ifaceq(8,6),ifacet(6,4),
-      &  ifacew1(4,5),ifacew2(8,5),nelem,jface,indexe,iit,
-- 
-2.37.0
-
--- a/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch
+++ b/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch
@ -1,23 +0,0 @@
-From 9b5e1f4bc119409a9b3edc72b1b7114d5b0b5141 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Thu, 12 Nov 2020 04:01:21 +0100
-Subject: [PATCH] Abaqus shell heat transfer elements read
-
---
- src/elements.f | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/elements.f b/src/elements.f
-index fa4c25a..1c587f4 100644
--- a/src/elements.f
-+++ b/src/elements.f
-@@ -137,7 +137,8 @@ c      endif
- !     
- !     removing the ABAQUS label for heat transfer elements
- !     
-        if((label(1:2).eq.'DC').and.(label(1:7).ne.'DCOUP3D')) then
-+        if((label(1:2).eq.'DC').or.(label(1:2).eq.'DS').and.
-+     &    (label(1:7).ne.'DCOUP3D')) then
-           label(1:7)=label(2:8)
-           label(8:8)=' '
- !     
--- a/ccx_2.19.src.tar.bz2
+++ b/ccx_2.19.src.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c75a69685811e7996c9428b491c82f0eff777cc9a0999f469d10156d75f26d07
-size 1496204
--- a/ccx_2.19.test.tar.bz2
+++ b/ccx_2.19.test.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7376881f7a7e5f0730e2aaa9fd518665ba380cc9fae7140919050e7752cdc01
-size 12397795