3 files changed, 29 insertions, 1 deletions

diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 0bbd0b841ab1..848fbc524e1e 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,5 +1,5 @@
 MD5 (calculix/ccx_1.1.src.tar.gz) = a8468774cab93aea811a309348d51e25
-MD5 (calculix/cgx_1.1.tar.gz) = 0794dfd5130f16dac785f0744def1403
+MD5 (calculix/cgx_1.1.tar.gz) = 64b60609efd5b11e6a5633c3287e62d5
 MD5 (calculix/ccx_1.1.ps.tar.gz) = ebd20e20724d9061bf193f20aeabbf05
 MD5 (calculix/cgx_1.1.ps.tar.gz) = 213f89fbe12c3acffa724f47f24cddc2
 MD5 (calculix/ccx_1.1.htm.tar.gz) = 392b97c0cb5b9af789aa4ccb45a1d932
diff --git a/cad/calculix/files/patch-ccx_VER+src+calinput.f b/cad/calculix/files/patch-ccx_VER+src+calinput.f
new file mode 100644
index 000000000000..958c2c42a0c2
--- /dev/null
+++ b/cad/calculix/files/patch-ccx_VER+src+calinput.f
@@ -0,0 +1,11 @@
+--- ccx_1.1/src/calinput.f.orig	Sun Sep 21 00:10:15 2003
++++ ccx_1.1/src/calinput.f	Sun Sep 21 00:11:34 2003
+@@ -544,7 +544,7 @@
+          if(i.gt.nlabel) then
+             nodeflab(1)='U   '
+             nodeflab(3)='S   '
+-            jout=1
++            jout=max(jout,1)
+             exit
+          endif
+          if(nodeflab(i).ne.'    ') exit
diff --git a/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f b/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f
new file mode 100644
index 000000000000..8e7d40c3cfd9
--- /dev/null
+++ b/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f
@@ -0,0 +1,17 @@
+--- ccx_1.1/src/e_c3d_rhs.f.orig	Tue Sep 23 23:17:44 2003
++++ ccx_1.1/src/e_c3d_rhs.f	Tue Sep 23 23:33:14 2003
+@@ -226,6 +226,14 @@
+ !           body forces
+ !
+             if(ibod.ne.0) then
++!
++! incorporating the jacobian determinant in the shape
++! functions
++!
++	    do i1=1,nope
++	    shpj(4,i1)=shp(4,i1)*xsj
++	    enddo
++!
+                if(om.gt.0.d0) then
+                   do i1=1,3
+ !