[calculix-ccx] 02/06: Update patches to new upstream version
Wolfgang Fütterer
debian at wlf-online.de
Tue Aug 9 08:13:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
wlfuetter-guest pushed a commit to branch master
in repository calculix-ccx.
commit 9057f5fde74e286a8ebab45f428faf7ba8b198ed
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Mon Aug 8 14:07:01 2016 +0200
Update patches to new upstream version
---
debian/calculix-ccx.install | 4 +-
...001-Adjust-Makefile-for-Build-with-Debian.patch | 27 +-
debian/patches/0002-Fixed-spelling-errors.patch | 282 +++++++++++----------
debian/rules | 2 +-
4 files changed, 170 insertions(+), 145 deletions(-)
diff --git a/debian/calculix-ccx.install b/debian/calculix-ccx.install
index 6e9e7e2..b0b3508 100644
--- a/debian/calculix-ccx.install
+++ b/debian/calculix-ccx.install
@@ -1,2 +1,2 @@
-./ccx_2.10/src/ccx /usr/bin
-debian/ccx.1 /usr/share/man/man1
\ No newline at end of file
+./ccx_2.11/src/ccx /usr/bin
+debian/ccx.1 /usr/share/man/man1
diff --git a/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch b/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch
index 86a7ebc..e0b9fcb 100644
--- a/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch
+++ b/debian/patches/0001-Adjust-Makefile-for-Build-with-Debian.patch
@@ -1,15 +1,16 @@
-From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
-Date: Wed, 25 Nov 2015 09:48:17 +0100
-Subject: Adjust Makefile for Build with Debian
+Description: Adjust Makefile for Build with Debian
+Forwarded: not-needed
+Author: Wolfgang Fütterer <debian at wlf-online.de>
+Last-Update: 2016-08-08
---
- ccx_2.10/src/Makefile | 12 +++---------
+ ccx_2.11/src/Makefile | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
-diff --git a/ccx_2.10/src/Makefile b/ccx_2.10/src/Makefile
-index 9335028..8a1c8c9 100755
---- a/ccx_2.10/src/Makefile
-+++ b/ccx_2.10/src/Makefile
+diff --git a/ccx_2.11/src/Makefile b/ccx_2.11/src/Makefile
+index ea5e025..462d650 100755
+--- a/ccx_2.11/src/Makefile
++++ b/ccx_2.11/src/Makefile
@@ -18,16 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
@@ -22,11 +23,11 @@ index 9335028..8a1c8c9 100755
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
-
--ccx_2.10: $(OCCXMAIN) ccx_2.10.a $(LIBS)
-- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
-+ccx_2.10: $(OCCXMAIN) ccx_2.10.a
-+ $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
+-ccx_2.11: $(OCCXMAIN) ccx_2.11.a $(LIBS)
+- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.11.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.11.a $(LIBS)
++ccx_2.11: $(OCCXMAIN) ccx_2.11.a
++ $(CC) $(CFLAGS) -c ccx_2.11.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.11.a $(LIBS)
- ccx_2.10.a: $(OCCXF) $(OCCXC)
+ ccx_2.11.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
-
diff --git a/debian/patches/0002-Fixed-spelling-errors.patch b/debian/patches/0002-Fixed-spelling-errors.patch
index eff2729..b4784d7 100644
--- a/debian/patches/0002-Fixed-spelling-errors.patch
+++ b/debian/patches/0002-Fixed-spelling-errors.patch
@@ -1,39 +1,41 @@
-From: =?utf-8?q?Wolfgang_F=C3=BCtterer?= <debian at wlf-online.de>
-Date: Wed, 20 Jan 2016 13:49:52 +0100
-Subject: Fixed spelling errors
+Description: Fixed spelling errors
+Forwarded: not-needed
+Author: Wolfgang Fütterer <debian at wlf-online.de>
+Last-Update: 2016-08-08
---
- ccx_2.10/src/LOGBOOK | 6 +++---
- ccx_2.10/src/cd_bleedtapping.f | 2 +-
- ccx_2.10/src/cd_own_albers.f | 2 +-
- ccx_2.10/src/cd_pk_albers.f | 2 +-
- ccx_2.10/src/characteristic.f | 2 +-
- ccx_2.10/src/compfluid.c | 2 +-
- ccx_2.10/src/gapconductances.f | 2 +-
- ccx_2.10/src/initialnet.f | 6 +++---
- ccx_2.10/src/intersectionpoint.f | 2 +-
- ccx_2.10/src/mafillpcompmain.c | 2 +-
- ccx_2.10/src/mafillpmain.c | 2 +-
- ccx_2.10/src/mafillsmasmain.c | 2 +-
- ccx_2.10/src/mafillsmmain.c | 2 +-
- ccx_2.10/src/mafillsmmain_se.c | 2 +-
- ccx_2.10/src/mafilltcompmain.c | 2 +-
- ccx_2.10/src/mafilltmain.c | 2 +-
- ccx_2.10/src/mafillvcompmain.c | 2 +-
- ccx_2.10/src/mafillvmain.c | 2 +-
- ccx_2.10/src/objectivesmmain_se.c | 2 +-
- ccx_2.10/src/radflowload.c | 2 +-
- ccx_2.10/src/readfrd.c | 6 +++---
- ccx_2.10/src/results.c | 2 +-
- ccx_2.10/src/results_se.c | 2 +-
- ccx_2.10/src/resultsinduction.c | 2 +-
- ccx_2.10/src/rhspmain.c | 2 +-
- 25 files changed, 31 insertions(+), 31 deletions(-)
+ ccx_2.11/src/LOGBOOK | 6 +++---
+ ccx_2.11/src/cd_bleedtapping.f | 2 +-
+ ccx_2.11/src/cd_own_albers.f | 2 +-
+ ccx_2.11/src/cd_pk_albers.f | 2 +-
+ ccx_2.11/src/characteristic.f | 2 +-
+ ccx_2.11/src/compfluid.c | 2 +-
+ ccx_2.11/src/gapconductances.f | 2 +-
+ ccx_2.11/src/initialnet.f | 6 +++---
+ ccx_2.11/src/intersectionpoint.f | 2 +-
+ ccx_2.11/src/mafillpcompmain.c | 2 +-
+ ccx_2.11/src/mafillpmain.c | 2 +-
+ ccx_2.11/src/mafillsmasmain.c | 2 +-
+ ccx_2.11/src/mafillsmmain.c | 2 +-
+ ccx_2.11/src/mafillsmmain_se.c | 2 +-
+ ccx_2.11/src/mafilltcompmain.c | 2 +-
+ ccx_2.11/src/mafilltmain.c | 2 +-
+ ccx_2.11/src/mafillvcompmain.c | 2 +-
+ ccx_2.11/src/mafillvmain.c | 2 +-
+ ccx_2.11/src/objectivemain_se.c | 2 +-
+ ccx_2.11/src/orifice.f | 4 ++--
+ ccx_2.11/src/radflowload.c | 2 +-
+ ccx_2.11/src/readfrd.c | 6 +++---
+ ccx_2.11/src/results.c | 2 +-
+ ccx_2.11/src/results_se.c | 2 +-
+ ccx_2.11/src/resultsinduction.c | 2 +-
+ ccx_2.11/src/rhspmain.c | 2 +-
+ 26 files changed, 33 insertions(+), 33 deletions(-)
-diff --git a/ccx_2.10/src/LOGBOOK b/ccx_2.10/src/LOGBOOK
-index 4c18e98..75a1943 100755
---- a/ccx_2.10/src/LOGBOOK
-+++ b/ccx_2.10/src/LOGBOOK
+diff --git a/ccx_2.11/src/LOGBOOK b/ccx_2.11/src/LOGBOOK
+index 10a4b1f..fe4dc59 100755
+--- a/ccx_2.11/src/LOGBOOK
++++ b/ccx_2.11/src/LOGBOOK
@@ -1807,7 +1807,7 @@ Dec 2002 - started to work on single crystal plasticity
5 April 2011 - wrote an interface to solve asymmetric matrices
with PARDISO
@@ -55,10 +57,10 @@ index 4c18e98..75a1943 100755
- changed a parameter in gencontelem.f
19 May 2011 - in user subroutine cload fn is provided. To this
-diff --git a/ccx_2.10/src/cd_bleedtapping.f b/ccx_2.10/src/cd_bleedtapping.f
+diff --git a/ccx_2.11/src/cd_bleedtapping.f b/ccx_2.11/src/cd_bleedtapping.f
index ae627a7..6ff0af7 100644
---- a/ccx_2.10/src/cd_bleedtapping.f
-+++ b/ccx_2.10/src/cd_bleedtapping.f
+--- a/ccx_2.11/src/cd_bleedtapping.f
++++ b/ccx_2.11/src/cd_bleedtapping.f
@@ -86,7 +86,7 @@
elseif(curve.gt.2) then
write(*,*)
@@ -68,10 +70,10 @@ index ae627a7..6ff0af7 100644
cd=1.d0
return
endif
-diff --git a/ccx_2.10/src/cd_own_albers.f b/ccx_2.10/src/cd_own_albers.f
+diff --git a/ccx_2.11/src/cd_own_albers.f b/ccx_2.11/src/cd_own_albers.f
index b7584ea..0e24927 100644
---- a/ccx_2.10/src/cd_own_albers.f
-+++ b/ccx_2.10/src/cd_own_albers.f
+--- a/ccx_2.11/src/cd_own_albers.f
++++ b/ccx_2.11/src/cd_own_albers.f
@@ -34,7 +34,7 @@
kappa=Kappa
cd=1.d0
@@ -81,10 +83,10 @@ index b7584ea..0e24927 100644
!
return
-diff --git a/ccx_2.10/src/cd_pk_albers.f b/ccx_2.10/src/cd_pk_albers.f
+diff --git a/ccx_2.11/src/cd_pk_albers.f b/ccx_2.11/src/cd_pk_albers.f
index 2f35f88..5860a3f 100644
---- a/ccx_2.10/src/cd_pk_albers.f
-+++ b/ccx_2.10/src/cd_pk_albers.f
+--- a/ccx_2.11/src/cd_pk_albers.f
++++ b/ccx_2.11/src/cd_pk_albers.f
@@ -42,7 +42,7 @@
cd=1.d0
@@ -94,11 +96,11 @@ index 2f35f88..5860a3f 100644
!
return
end
-diff --git a/ccx_2.10/src/characteristic.f b/ccx_2.10/src/characteristic.f
-index 4869a21..ea943c3 100644
---- a/ccx_2.10/src/characteristic.f
-+++ b/ccx_2.10/src/characteristic.f
-@@ -25,7 +25,7 @@
+diff --git a/ccx_2.11/src/characteristic.f b/ccx_2.11/src/characteristic.f
+index 20419e8..f8614df 100644
+--- a/ccx_2.11/src/characteristic.f
++++ b/ccx_2.11/src/characteristic.f
+@@ -27,7 +27,7 @@
! massflow*dsqrt(T1)/Pt1=f((Pt1-Pt2)/Pt1) and T1=T2
! characteristics the subroutine proceeds using
! linear interpolation to estimate the values for the whole characteristic
@@ -107,11 +109,11 @@ index 4869a21..ea943c3 100644
!
! author: Yannick Muller
!
-diff --git a/ccx_2.10/src/compfluid.c b/ccx_2.10/src/compfluid.c
-index 55aa22e..bf92181 100644
---- a/ccx_2.10/src/compfluid.c
-+++ b/ccx_2.10/src/compfluid.c
-@@ -182,7 +182,7 @@ void compfluid(double **cop, ITG *nk, ITG **ipkonfp, ITG **konp, char **lakonfp,
+diff --git a/ccx_2.11/src/compfluid.c b/ccx_2.11/src/compfluid.c
+index 231e1f8..ed9c55a 100644
+--- a/ccx_2.11/src/compfluid.c
++++ b/ccx_2.11/src/compfluid.c
+@@ -183,7 +183,7 @@ void compfluid(double **cop, ITG *nk, ITG **ipkonfp, ITG **konp, char **lakonfp,
}
}
@@ -120,10 +122,10 @@ index 55aa22e..bf92181 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/gapconductances.f b/ccx_2.10/src/gapconductances.f
+diff --git a/ccx_2.11/src/gapconductances.f b/ccx_2.11/src/gapconductances.f
index 956e20a..0a3ec23 100644
---- a/ccx_2.10/src/gapconductances.f
-+++ b/ccx_2.10/src/gapconductances.f
+--- a/ccx_2.11/src/gapconductances.f
++++ b/ccx_2.11/src/gapconductances.f
@@ -55,7 +55,7 @@
if(nelcon(1,nmat).eq.0) then
write(*,*) '*ERROR reading *GAP CONDUCTANCE:'
@@ -133,11 +135,11 @@ index 956e20a..0a3ec23 100644
call exit(201)
endif
!
-diff --git a/ccx_2.10/src/initialnet.f b/ccx_2.10/src/initialnet.f
-index 86ebc18..872672d 100644
---- a/ccx_2.10/src/initialnet.f
-+++ b/ccx_2.10/src/initialnet.f
-@@ -630,7 +630,7 @@ c enddo
+diff --git a/ccx_2.11/src/initialnet.f b/ccx_2.11/src/initialnet.f
+index 1ddfdf9..c2999f1 100644
+--- a/ccx_2.11/src/initialnet.f
++++ b/ccx_2.11/src/initialnet.f
+@@ -664,7 +664,7 @@ c write(*,*) 'initialnet ',node,bc(nactdog(2,node))
write(*,*) ' node1',node1,' pressure'
& ,v(2,node1)
write(*,*) ' node2',node2,
@@ -146,7 +148,7 @@ index 86ebc18..872672d 100644
& v(2,node2)
v(2,node2)=0.9*v(2,node2)
write(*,*) ' node2',node2,
-@@ -649,12 +649,12 @@ c enddo
+@@ -683,12 +683,12 @@ c write(*,*) 'initialnet ',node,bc(nactdog(2,node))
& ' given initial pressure',v(2,node1)
v(2,node1)=1.05*v(2,node2)
write(*,*) ' node1',node1,
@@ -161,10 +163,10 @@ index 86ebc18..872672d 100644
endif
endif
!
-diff --git a/ccx_2.10/src/intersectionpoint.f b/ccx_2.10/src/intersectionpoint.f
+diff --git a/ccx_2.11/src/intersectionpoint.f b/ccx_2.11/src/intersectionpoint.f
index bdb1def..e7b0dc0 100644
---- a/ccx_2.10/src/intersectionpoint.f
-+++ b/ccx_2.10/src/intersectionpoint.f
+--- a/ccx_2.11/src/intersectionpoint.f
++++ b/ccx_2.11/src/intersectionpoint.f
@@ -31,7 +31,7 @@
diff=0.0
if(abs(eplane(pab,xcp,0)).lt.1.d-13)then
@@ -174,10 +176,10 @@ index bdb1def..e7b0dc0 100644
call exit(201)
else
tnull=0.0
-diff --git a/ccx_2.10/src/mafillpcompmain.c b/ccx_2.10/src/mafillpcompmain.c
+diff --git a/ccx_2.11/src/mafillpcompmain.c b/ccx_2.11/src/mafillpcompmain.c
index 8e772d6..929495c 100644
---- a/ccx_2.10/src/mafillpcompmain.c
-+++ b/ccx_2.10/src/mafillpcompmain.c
+--- a/ccx_2.11/src/mafillpcompmain.c
++++ b/ccx_2.11/src/mafillpcompmain.c
@@ -93,7 +93,7 @@ void mafillpcompmain(ITG *nef,char *lakonf,ITG *ipnei,
}
}
@@ -187,10 +189,10 @@ index 8e772d6..929495c 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/mafillpmain.c b/ccx_2.10/src/mafillpmain.c
+diff --git a/ccx_2.11/src/mafillpmain.c b/ccx_2.11/src/mafillpmain.c
index 053f13a..e8db684 100644
---- a/ccx_2.10/src/mafillpmain.c
-+++ b/ccx_2.10/src/mafillpmain.c
+--- a/ccx_2.11/src/mafillpmain.c
++++ b/ccx_2.11/src/mafillpmain.c
@@ -90,7 +90,7 @@ void mafillpmain(ITG *nef,char *lakonf,ITG *ipnei,
}
}
@@ -200,10 +202,10 @@ index 053f13a..e8db684 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/mafillsmasmain.c b/ccx_2.10/src/mafillsmasmain.c
+diff --git a/ccx_2.11/src/mafillsmasmain.c b/ccx_2.11/src/mafillsmasmain.c
index 1395f85..fd72977 100644
---- a/ccx_2.10/src/mafillsmasmain.c
-+++ b/ccx_2.10/src/mafillsmasmain.c
+--- a/ccx_2.11/src/mafillsmasmain.c
++++ b/ccx_2.11/src/mafillsmasmain.c
@@ -130,7 +130,7 @@ void mafillsmasmain(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,
}
}
@@ -213,10 +215,10 @@ index 1395f85..fd72977 100644
if(*ne-*ne0<num_cpus) num_cpus=*ne-*ne0;
if(num_cpus<1)num_cpus=1;
-diff --git a/ccx_2.10/src/mafillsmmain.c b/ccx_2.10/src/mafillsmmain.c
-index c58a5fb..82f0dff 100644
---- a/ccx_2.10/src/mafillsmmain.c
-+++ b/ccx_2.10/src/mafillsmmain.c
+diff --git a/ccx_2.11/src/mafillsmmain.c b/ccx_2.11/src/mafillsmmain.c
+index cbc75f7..463d830 100644
+--- a/ccx_2.11/src/mafillsmmain.c
++++ b/ccx_2.11/src/mafillsmmain.c
@@ -130,7 +130,7 @@ void mafillsmmain(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,
}
}
@@ -226,11 +228,11 @@ index c58a5fb..82f0dff 100644
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/mafillsmmain_se.c b/ccx_2.10/src/mafillsmmain_se.c
-index 8da0b84..7bc1409 100644
---- a/ccx_2.10/src/mafillsmmain_se.c
-+++ b/ccx_2.10/src/mafillsmmain_se.c
-@@ -131,7 +131,7 @@ void mafillsmmain_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,
+diff --git a/ccx_2.11/src/mafillsmmain_se.c b/ccx_2.11/src/mafillsmmain_se.c
+index a8a7826..1e7821e 100644
+--- a/ccx_2.11/src/mafillsmmain_se.c
++++ b/ccx_2.11/src/mafillsmmain_se.c
+@@ -134,7 +134,7 @@ void mafillsmmain_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,
}
}
@@ -239,10 +241,10 @@ index 8da0b84..7bc1409 100644
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/mafilltcompmain.c b/ccx_2.10/src/mafilltcompmain.c
+diff --git a/ccx_2.11/src/mafilltcompmain.c b/ccx_2.11/src/mafilltcompmain.c
index cb93673..c8c83e4 100644
---- a/ccx_2.10/src/mafilltcompmain.c
-+++ b/ccx_2.10/src/mafilltcompmain.c
+--- a/ccx_2.11/src/mafilltcompmain.c
++++ b/ccx_2.11/src/mafilltcompmain.c
@@ -95,7 +95,7 @@ void mafilltcompmain(ITG *nef,ITG *ipnei,ITG *neifa,
}
}
@@ -252,10 +254,10 @@ index cb93673..c8c83e4 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/mafilltmain.c b/ccx_2.10/src/mafilltmain.c
+diff --git a/ccx_2.11/src/mafilltmain.c b/ccx_2.11/src/mafilltmain.c
index 8139b49..d785dfa 100644
---- a/ccx_2.10/src/mafilltmain.c
-+++ b/ccx_2.10/src/mafilltmain.c
+--- a/ccx_2.11/src/mafilltmain.c
++++ b/ccx_2.11/src/mafilltmain.c
@@ -95,7 +95,7 @@ void mafilltmain(ITG *nef,ITG *ipnei,ITG *neifa,
}
}
@@ -265,11 +267,11 @@ index 8139b49..d785dfa 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/mafillvcompmain.c b/ccx_2.10/src/mafillvcompmain.c
-index 702b5ff..2069401 100644
---- a/ccx_2.10/src/mafillvcompmain.c
-+++ b/ccx_2.10/src/mafillvcompmain.c
-@@ -94,7 +94,7 @@ void mafillvcompmain(ITG *nef,ITG *ipnei,ITG *neifa,ITG *neiel,
+diff --git a/ccx_2.11/src/mafillvcompmain.c b/ccx_2.11/src/mafillvcompmain.c
+index 1fdbc93..dd14d45 100644
+--- a/ccx_2.11/src/mafillvcompmain.c
++++ b/ccx_2.11/src/mafillvcompmain.c
+@@ -96,7 +96,7 @@ void mafillvcompmain(ITG *nef,ITG *ipnei,ITG *neifa,ITG *neiel,
}
}
@@ -278,11 +280,11 @@ index 702b5ff..2069401 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/mafillvmain.c b/ccx_2.10/src/mafillvmain.c
-index dfd41cd..f5461ef 100644
---- a/ccx_2.10/src/mafillvmain.c
-+++ b/ccx_2.10/src/mafillvmain.c
-@@ -92,7 +92,7 @@ void mafillvmain(ITG *nef,ITG *ipnei,ITG *neifa,ITG *neiel,
+diff --git a/ccx_2.11/src/mafillvmain.c b/ccx_2.11/src/mafillvmain.c
+index 4dac99e..1fb57c1 100644
+--- a/ccx_2.11/src/mafillvmain.c
++++ b/ccx_2.11/src/mafillvmain.c
+@@ -94,7 +94,7 @@ void mafillvmain(ITG *nef,ITG *ipnei,ITG *neifa,ITG *neiel,
}
}
@@ -291,24 +293,46 @@ index dfd41cd..f5461ef 100644
if(*nef<num_cpus) num_cpus=*nef;
-diff --git a/ccx_2.10/src/objectivesmmain_se.c b/ccx_2.10/src/objectivesmmain_se.c
-index 184d10e..d55196e 100644
---- a/ccx_2.10/src/objectivesmmain_se.c
-+++ b/ccx_2.10/src/objectivesmmain_se.c
-@@ -132,7 +132,7 @@ void objectivesmmain_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,ITG *
+diff --git a/ccx_2.11/src/objectivemain_se.c b/ccx_2.11/src/objectivemain_se.c
+index c1f7d09..c513ba3 100644
+--- a/ccx_2.11/src/objectivemain_se.c
++++ b/ccx_2.11/src/objectivemain_se.c
+@@ -138,7 +138,7 @@ void objectivemain_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,ITG *ne
}
}
-
+
-// next line is to be inserted in a similar way for all other paralell parts
+// next line is to be inserted in a similar way for all other parallel parts
-
+
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/radflowload.c b/ccx_2.10/src/radflowload.c
-index 9876a98..a4633e4 100644
---- a/ccx_2.10/src/radflowload.c
-+++ b/ccx_2.10/src/radflowload.c
-@@ -352,7 +352,7 @@ void radflowload(ITG *itg,ITG *ieg,ITG *ntg,ITG *ntr,double *adrad,
+diff --git a/ccx_2.11/src/orifice.f b/ccx_2.11/src/orifice.f
+index 987d620..c738f7f 100644
+--- a/ccx_2.11/src/orifice.f
++++ b/ccx_2.11/src/orifice.f
+@@ -194,7 +194,7 @@ c external ofvidg
+ else
+ write(*,*) '*ERROR in orifice:'
+ write(*,*) ' element',nelemswirl
+- write(*,*) ' refered by element',nelem
++ write(*,*) ' referred by element',nelem
+ write(*,*) ' is not a swirl generating element'
+ endif
+ endif
+@@ -520,7 +520,7 @@ c endif
+ else
+ write(*,*) '*ERROR in orifice:'
+ write(*,*) ' element',nelemswirl
+- write(*,*) 'refered by element',nelem
++ write(*,*) 'referred by element',nelem
+ write(*,*) 'is not a swirl generating element'
+ endif
+ endif
+diff --git a/ccx_2.11/src/radflowload.c b/ccx_2.11/src/radflowload.c
+index fc93651..34a3170 100644
+--- a/ccx_2.11/src/radflowload.c
++++ b/ccx_2.11/src/radflowload.c
+@@ -409,7 +409,7 @@ void radflowload(ITG *itg,ITG *ieg,ITG *ntg,ITG *ntr,double *adrad,
}
}
@@ -317,10 +341,10 @@ index 9876a98..a4633e4 100644
if(*ntr<num_cpus) num_cpus=*ntr;
-diff --git a/ccx_2.10/src/readfrd.c b/ccx_2.10/src/readfrd.c
+diff --git a/ccx_2.11/src/readfrd.c b/ccx_2.11/src/readfrd.c
index 46a5980..cbcc163 100644
---- a/ccx_2.10/src/readfrd.c
-+++ b/ccx_2.10/src/readfrd.c
+--- a/ccx_2.11/src/readfrd.c
++++ b/ccx_2.11/src/readfrd.c
@@ -742,7 +742,7 @@ int readfrd( char *datin, Summen *anz, Nodes **nptr, Elements **eptr, Datasets *
if( lcase[anz->l].irtype > 2 )
@@ -348,10 +372,10 @@ index 46a5980..cbcc163 100644
return(-1);
}
-diff --git a/ccx_2.10/src/results.c b/ccx_2.10/src/results.c
-index d6390a4..60415c3 100644
---- a/ccx_2.10/src/results.c
-+++ b/ccx_2.10/src/results.c
+diff --git a/ccx_2.11/src/results.c b/ccx_2.11/src/results.c
+index e8c1b05..0e3333e 100644
+--- a/ccx_2.11/src/results.c
++++ b/ccx_2.11/src/results.c
@@ -147,7 +147,7 @@ void results(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,ITG *ne,
}
}
@@ -361,11 +385,11 @@ index d6390a4..60415c3 100644
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/results_se.c b/ccx_2.10/src/results_se.c
-index ee5bdee..be49329 100644
---- a/ccx_2.10/src/results_se.c
-+++ b/ccx_2.10/src/results_se.c
-@@ -151,7 +151,7 @@ void results_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,ITG *ne,
+diff --git a/ccx_2.11/src/results_se.c b/ccx_2.11/src/results_se.c
+index d93c14f..54ebc9a 100644
+--- a/ccx_2.11/src/results_se.c
++++ b/ccx_2.11/src/results_se.c
+@@ -135,7 +135,7 @@ void results_se(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,ITG *ne,
}
}
@@ -374,10 +398,10 @@ index ee5bdee..be49329 100644
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/resultsinduction.c b/ccx_2.10/src/resultsinduction.c
-index d400f45..47cf0f3 100644
---- a/ccx_2.10/src/resultsinduction.c
-+++ b/ccx_2.10/src/resultsinduction.c
+diff --git a/ccx_2.11/src/resultsinduction.c b/ccx_2.11/src/resultsinduction.c
+index 8443af9..9dc5e3a 100644
+--- a/ccx_2.11/src/resultsinduction.c
++++ b/ccx_2.11/src/resultsinduction.c
@@ -148,7 +148,7 @@ void resultsinduction(double *co,ITG *nk,ITG *kon,ITG *ipkon,char *lakon,
}
}
@@ -387,10 +411,10 @@ index d400f45..47cf0f3 100644
if(*ne<num_cpus) num_cpus=*ne;
-diff --git a/ccx_2.10/src/rhspmain.c b/ccx_2.10/src/rhspmain.c
+diff --git a/ccx_2.11/src/rhspmain.c b/ccx_2.11/src/rhspmain.c
index ff69d44..c98a18c 100644
---- a/ccx_2.10/src/rhspmain.c
-+++ b/ccx_2.10/src/rhspmain.c
+--- a/ccx_2.11/src/rhspmain.c
++++ b/ccx_2.11/src/rhspmain.c
@@ -90,7 +90,7 @@ void rhspmain(ITG *nef,char *lakonf,ITG *ipnei,
}
}
diff --git a/debian/rules b/debian/rules
index dc53fb9..994d725 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-CCX_VERSION=2.10
+CCX_VERSION=2.11
CCX_SRC=ccx_${CCX_VERSION}/src
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-ccx.git
More information about the debian-science-commits
mailing list