diff --git a/0001-Add-missing-argument-for-inputerror-function-call.patch b/0001-Add-missing-argument-for-inputerror-function-call.patch index c7a8c3f..939086f 100644 --- a/0001-Add-missing-argument-for-inputerror-function-call.patch +++ b/0001-Add-missing-argument-for-inputerror-function-call.patch @@ -1,25 +1,25 @@ -From 6b2b0cecc1073754c3c11f65f3aa2400d76fb842 Mon Sep 17 00:00:00 2001 +From d72c6c52d1a4535bb04e24b09f02bf52a990eb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Mon, 22 Feb 2021 23:42:52 +0100 +Date: Sun, 30 Jan 2022 16:06:47 +0100 Subject: [PATCH] Add missing argument for inputerror function call --- - src/allocation_rfn.f | 2 +- + src/crackpropagations.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/allocation_rfn.f b/src/allocation_rfn.f -index 5ce50dc..62c3f3a 100644 ---- a/src/allocation_rfn.f -+++ b/src/allocation_rfn.f -@@ -112,7 +112,7 @@ - read(textpart(1)(1:10),'(i10)',iostat=istat) i - if(istat.gt.0) then - call inputerror(inpc,ipoinpc,iline, -- & "*NODE%") -+ & "*NODE%",ier) - exit - endif - nk_=max(nk_,i) +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.30.1 +2.34.1 diff --git a/0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch b/0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch new file mode 100644 index 0000000..5419059 --- /dev/null +++ b/0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch @@ -0,0 +1,35 @@ +From 59b0a4eca5ea6efd138a708fc5ba4b98a499b2d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +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 + diff --git a/0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch b/0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch new file mode 100644 index 0000000..8420bc1 --- /dev/null +++ b/0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch @@ -0,0 +1,29 @@ +From 5b272a99dfd8726be69f8515c8406a5423019f5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +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 + diff --git a/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch b/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch index 9c5270a..724615d 100644 --- a/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch +++ b/ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch @@ -11,13 +11,13 @@ diff --git a/src/elements.f b/src/elements.f index fa4c25a..1c587f4 100644 --- a/src/elements.f +++ b/src/elements.f -@@ -129,7 +129,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)=' ' - ! +@@ -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)=' ' + ! diff --git a/ccx-2.16-build.patch b/ccx-2.16-build.patch index 73f5850..496bb16 100644 --- a/ccx-2.16-build.patch +++ b/ccx-2.16-build.patch @@ -30,4 +30,4 @@ index 97ce9d1..c785f62 100755 + -larpack -llapack -lblas \ -lpthread -lm -lc - ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) + ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS) diff --git a/ccx-rpmlintrc b/ccx-rpmlintrc index eec5bfd..c5a1248 100644 --- a/ccx-rpmlintrc +++ b/ccx-rpmlintrc @@ -1,2 +1,2 @@ # Zero length reference files -addFilter("ccx-examples.noarch: W: zero-length /usr/share/ccx-examples-.*/.*.ref") +addFilter("ccx-examples.noarch:.*zero-length /usr/share/ccx-examples-.*/.*.ref") diff --git a/ccx.changes b/ccx.changes index ffa9200..d8828a9 100644 --- a/ccx.changes +++ b/ccx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Jan 30 19:11:16 UTC 2022 - Stefan Brüns + +- update to 2.19: + Too many changes to list, a full list of changes is available in + the included LOGFILE. +- Add 0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch +- Add 0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch +- Disable beamfsh1 test on aarch64 and i586 + ------------------------------------------------------------------- Tue Feb 23 11:23:36 UTC 2021 - Stefan Brüns diff --git a/ccx.spec b/ccx.spec index 095d149..d298ea9 100644 --- a/ccx.spec +++ b/ccx.spec @@ -17,7 +17,7 @@ Name: ccx -Version: 2.17 +Version: 2.19 Release: 0 Summary: An open source finite element package License: GPL-2.0-only AND BSD-3-Clause AND SUSE-Public-Domain @@ -32,6 +32,8 @@ Patch1: 0001-Fixup-spooles-include-dir.patch Patch2: ccx-2.16-abaqus-shell-heat-transfer-elements-read.patch Patch3: 0001-Add-missing-argument-for-inputerror-function-call.patch Patch4: 0001-Use-interface-for-cubtri-callback-function.patch +Patch5: 0001-Fix-wrong-parameter-passed-to-us3_materialdata_me.patch +Patch6: 0001-Fix-wrong-scalar-declaration-for-2x2-inverse-Jacobia.patch BuildRequires: arpack-ng-devel BuildRequires: fdupes BuildRequires: gcc-fortran @@ -98,23 +100,46 @@ chmod 444 src/BUGS src/LOGBOOK src/README.INSTALL src/TODO %check cd test +# beamfsh1 slightly deviates on aarch64 and i586 +%ifarch aarch64 %{ix86} +for f in beamfsh1.inp; do mv $f ${f}_disabled ; done +%endif # beamread* depends on beamwrite* # beamprand is random # beamptied{5,6} have nondeterministic order of eigenvalues -for f in beamread*.inp beamprand.inp beamptied{5,6}.inp ; do mv $f ${f}_disabled ; done +# beamhtfc2 needs output from beamhtfc +for f in beamread*.inp beamprand.inp beamptied{5,6}.inp beamhtfc2.inp; do mv $f ${f}_disabled ; done set +x -for input in beam*.inp ; do - f=`basename $input .inp` - echo -n "Procesing $f " +function checkInput() { + f=`basename $1 .inp` + echo -n "Procesing $f " | tee -a ccxlog %{buildroot}/%{_bindir}/ccx $f >> ccxlog || echo -n "-> $?" ; echo [ -f $f.dat -a -f $f.frd ] || echo "$f failed!" | tee -a errorlog [ "$(wc -l < $f.dat)" -eq "$(wc -l < $f.dat.ref)" ] || echo "Wrong size: $f.dat" | tee -a errorlog grep NaN $f.dat && echo "Contains NaN: $f.dat" | tee -a errorlog ./datcheck.pl $f | tee -a errorlog - [ -f $f.frd.ref ] || continue + [ -f $f.frd.ref ] || return 0 [ "$(wc -l < $f.frd)" -eq "$(wc -l < $f.frd.ref)" ] || echo "Wrong size: $f.frd" | tee -a errorlog ./frdcheck.pl $f | tee -a errorlog +} + +for f in beam*.inp ; do + checkInput $f done + +# Second round +cp beamhtfc.rout beamhtfc2.rin +mv beamhtfc2.inp{_disabled,} +checkInput beamhtfc2.inp + +for f in beamwrite*.inp ; do + tc=${f##beamwrite}; tc=${tc%%.inp} + mv beamread${tc}.inp_disabled beamread${tc}.inp + cp beamwrite${tc}.rout beamread${tc}.rin + checkInput beamread${tc}.inp +done + +# CHeck results set -x if [ -s errorlog ] ; then cat ccxlog diff --git a/ccx_2.17.src.tar.bz2 b/ccx_2.17.src.tar.bz2 deleted file mode 100644 index 53a378f..0000000 --- a/ccx_2.17.src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50 -size 1503269 diff --git a/ccx_2.17.test.tar.bz2 b/ccx_2.17.test.tar.bz2 deleted file mode 100644 index 2544265..0000000 --- a/ccx_2.17.test.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf -size 12396359 diff --git a/ccx_2.19.src.tar.bz2 b/ccx_2.19.src.tar.bz2 new file mode 100644 index 0000000..c9685b2 --- /dev/null +++ b/ccx_2.19.src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c75a69685811e7996c9428b491c82f0eff777cc9a0999f469d10156d75f26d07 +size 1496204 diff --git a/ccx_2.19.test.tar.bz2 b/ccx_2.19.test.tar.bz2 new file mode 100644 index 0000000..ae9ea0e --- /dev/null +++ b/ccx_2.19.test.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7376881f7a7e5f0730e2aaa9fd518665ba380cc9fae7140919050e7752cdc01 +size 12397795