Ticket #65627: patch-ccx-build.diff

ccx_2.18/src

@@ -320 +320 @@
                             ITG *irows,ITG *ndesi,ITG *nodedesi,double *corrlen,
                             double *randomval,ITG *irobustdesign));
 
+void FORTRAN(auglag_inclusion ,(int conttype, double *gcontfull, int nacti,
+            int ncdim, double mufric, double atol, double rtol, double *pkvec,
+            int kitermax, double timek ));
+
 void FORTRAN(basis,(double *x,double *y,double *z,double *xo,double *yo,
                     double *zo,ITG *nx,ITG *ny,ITG *nz,double *planfa,
                     ITG *ifatet,ITG *nktet,ITG *netet,double *field,
@@ -901 +905 @@
 void FORTRAN(checktruecontact,(ITG *ntie,char *tieset,double *tietol,
              double *elcon,ITG *itruecontact,ITG *ncmat_,ITG *ntmat_));
 
-void FORTRAN(clonesensitivies,(ITG *nobject,ITG *nk,char *objectset,
+void FORTRAN(clonesensitivities,(ITG *nobject,ITG *nk,char *objectset,
                                double *g0,double *dgdxglob));
 
 void FORTRAN(closefile,());
@@ -1391 +1395 @@
                                 ITG *jqib,double *g,ITG *icolbb,ITG *nactdof,
                                 double *qtmp));
 
+void FORTRAN(detectactivecont2,(double *gapnorm, double *gapdof,
+                double *auw, int *iroww, int *jqw,
+                int neqtot, int nslavs, double *springarea,
+                int *iacti, int nacti));
+
 void FORTRAN(determineextern,(ITG *ifac,ITG *itetfa,ITG *iedg,ITG *ipoed,
                               ITG *iexternedg,ITG *iexternfa,ITG *iexternnode,
                               ITG *nktet_,ITG *ipofa));
@@ -4674 +4683 @@
                       ITG *newsize,ITG *ifatet,ITG *itetfa,ITG *iedg,
                       ITG *ieled));
 
+void FORTRAN(relaxval_al, (double *gcontfull, int nacti, int ncdim));
+
 void remastruct(ITG *ipompc,double **coefmpcp,ITG **nodempcp,ITG *nmpc,
                 ITG *mpcfree,ITG *nodeboun,ITG *ndirboun,ITG *nboun,
                 ITG *ikmpc,ITG *ilmpc,ITG *ikboun,ITG *ilboun,
@@ -6020 +6031 @@
 
 void utempread(double *t1,ITG *istep,char *jobnamec);
 
+double v_betrag(double *a);
+
+void v_prod( double *A, double *B, double *C );
+
+void v_result( const double *A, const double *B, double *C );
+
 void FORTRAN(varsmooth,(double *aub,double *adl,
                              double *sol,double *aux,ITG *irow,
                              ITG *jq,ITG *neqa,ITG *neqb,double *alpha));

ccx_2.18/src

@@ -1 +1 @@
 
-CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-FFLAGS = -Wall -O2
+CFLAGS += -Wall -O2 -pthread  -I../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DUSE_MT=1 -DBLAS_LIBRARIES=vecLibFort -DLAPACK_LIBRARIES=vecLibFort
+FFLAGS += -O2
+LDFLAGS +=
 
-CC=cc
-FC=gfortran
 
 .c.o :
         $(CC) $(CFLAGS) -c $<
@@ -18 +18 @@
 OCCXC = $(SCCXC:.c=.o)
 OCCXMAIN = $(SCCXMAIN:.c=.o)
 
-DIR=../../../SPOOLES.2.2
+DIR=../../SPOOLES.2.2
 
 LIBS = \
        $(DIR)/spooles.a \
-        ../../../ARPACK/libarpack_INTEL.a \
+       -larpack -lvecLibFort \
        -lpthread -lm -lc
 
-ccx_2.18: $(OCCXMAIN) ccx_2.18.a  $(LIBS)
-        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
+ccx_2.18: $(OCCXMAIN) ccx_2.18.a 
+        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
 
 ccx_2.18.a: $(OCCXF) $(OCCXC)

ccx_2.18/src

@@ -77 +77 @@
      &  mw,nfe
       REAL*8 ALFA, ANS, ANSKP, AREA, EPS, ERR, ERRMAX, H, Q1, Q2, R1,R2,
      * RDATA(1), D(2,4), S(4), T(2,3), VEC(2,3), W(6,NW), X(2),zero,
-     & point5,one,rnderr
+     & point5,one,F,rnderr
 C       ACTUAL DIMENSION OF W IS (6,NW/6)
 C
       REAL*8 TANS, TERR, DZERO

ccx_2.18/src

@@ -13 +13 @@
 
 # inserting the date into ccx_2.18step.c
 
-@ARGV="ccx_2.18step.c";
+@ARGV="CalculiXstep.c";
 $^I=".old";
 while(<>){
     s/You are using an executable made on.*/You are using an executable made on $date\\n");/g;
@@ -30 +30 @@
 }
 
 system "rm -f ccx_2.18.c.old";
-system "rm -f ccx_2.18step.c.old";
+system "rm -f CalculiXstep.c.old";
 system "rm -f frd.c.old";

premortar.c

@@ -19 +19 @@
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
+#include <string.h>
 #include "CalculiX.h"
 #include "mortar.h"
 

resultsmech_us3.f

@@ -461 +461 @@
      &     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)        

sensi_coor.c

@@ -18 +18 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 #include "CalculiX.h"
 
 void sensi_coor(double *co,ITG *nk,ITG **konp,ITG **ipkonp,char **lakonp,

sensi_orien.c

@@ -18 +18 @@
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 #include "CalculiX.h"
 
 void sensi_orien(double *co,ITG *nk,ITG **konp,ITG **ipkonp,char **lakonp,

ccx_2.18/src

@@ -454 +454 @@
       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
       !

CalculiXstep.c

@@ -261 +261 @@
    
     clock_gettime(CLOCK_MONOTONIC, &totalCalculixTimeStart);
 
-    if(argc==1){printf("Usage: CalculiX.exe -i jobname\n");FORTRAN(stop,());}
+    if(argc==1){printf("Usage: ccx -i jobname\n");FORTRAN(stop,());}
     else{
       for(i=1;i<argc;i++){
         if(strcmp1(argv[i],"-i")==0) {

ccx_2.18/src

@@ -115 +115 @@
 
   clock_gettime(CLOCK_MONOTONIC, &totalCalculixTimeStart);
 
-  if(argc==1){printf("Usage: CalculiX.exe -i jobname\n");FORTRAN(stop,());}
+  if(argc==1){printf("Usage: ccx -i jobname\n");FORTRAN(stop,());}
   else{
     for(i=1;i<argc;i++){
       if(strcmp1(argv[i],"-i")==0){