Ticket #65627: patch-ccx-build.diff

File patch-ccx-build.diff, 7.6 KB (added by mbrethen, 2 years ago)
  • ccx_2.18/src

    diff -u ccx_2.18/src.orig/CalculiX.h ccx_2.18/src/CalculiX.h
    old new  
    320320                            ITG *irows,ITG *ndesi,ITG *nodedesi,double *corrlen,
    321321                            double *randomval,ITG *irobustdesign));
    322322
     323void FORTRAN(auglag_inclusion ,(int conttype, double *gcontfull, int nacti,
     324            int ncdim, double mufric, double atol, double rtol, double *pkvec,
     325            int kitermax, double timek ));
     326
    323327void FORTRAN(basis,(double *x,double *y,double *z,double *xo,double *yo,
    324328                    double *zo,ITG *nx,ITG *ny,ITG *nz,double *planfa,
    325329                    ITG *ifatet,ITG *nktet,ITG *netet,double *field,
     
    901905void FORTRAN(checktruecontact,(ITG *ntie,char *tieset,double *tietol,
    902906             double *elcon,ITG *itruecontact,ITG *ncmat_,ITG *ntmat_));
    903907
    904 void FORTRAN(clonesensitivies,(ITG *nobject,ITG *nk,char *objectset,
     908void FORTRAN(clonesensitivities,(ITG *nobject,ITG *nk,char *objectset,
    905909                               double *g0,double *dgdxglob));
    906910
    907911void FORTRAN(closefile,());
     
    13911395                                ITG *jqib,double *g,ITG *icolbb,ITG *nactdof,
    13921396                                double *qtmp));
    13931397
     1398void FORTRAN(detectactivecont2,(double *gapnorm, double *gapdof,
     1399                double *auw, int *iroww, int *jqw,
     1400                int neqtot, int nslavs, double *springarea,
     1401                int *iacti, int nacti));
     1402
    13941403void FORTRAN(determineextern,(ITG *ifac,ITG *itetfa,ITG *iedg,ITG *ipoed,
    13951404                              ITG *iexternedg,ITG *iexternfa,ITG *iexternnode,
    13961405                              ITG *nktet_,ITG *ipofa));
     
    46744683                      ITG *newsize,ITG *ifatet,ITG *itetfa,ITG *iedg,
    46754684                      ITG *ieled));
    46764685
     4686void FORTRAN(relaxval_al, (double *gcontfull, int nacti, int ncdim));
     4687
    46774688void remastruct(ITG *ipompc,double **coefmpcp,ITG **nodempcp,ITG *nmpc,
    46784689                ITG *mpcfree,ITG *nodeboun,ITG *ndirboun,ITG *nboun,
    46794690                ITG *ikmpc,ITG *ilmpc,ITG *ikboun,ITG *ilboun,
     
    60206031
    60216032void utempread(double *t1,ITG *istep,char *jobnamec);
    60226033
     6034double v_betrag(double *a);
     6035
     6036void v_prod( double *A, double *B, double *C );
     6037
     6038void v_result( const double *A, const double *B, double *C );
     6039
    60236040void FORTRAN(varsmooth,(double *aub,double *adl,
    60246041                             double *sol,double *aux,ITG *irow,
    60256042                             ITG *jq,ITG *neqa,ITG *neqb,double *alpha));
  • ccx_2.18/src

    diff -u ccx_2.18/src.orig/Makefile ccx_2.18/src/Makefile
    old new  
    11
    2 CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
    3 FFLAGS = -Wall -O2
     2CFLAGS += -Wall -O2 -pthread  -I../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DUSE_MT=1 -DBLAS_LIBRARIES=vecLibFort -DLAPACK_LIBRARIES=vecLibFort
     3FFLAGS += -O2
     4LDFLAGS +=
    45
    5 CC=cc
    6 FC=gfortran
    76
    87.c.o :
    98        $(CC) $(CFLAGS) -c $<
     
    1818OCCXC = $(SCCXC:.c=.o)
    1919OCCXMAIN = $(SCCXMAIN:.c=.o)
    2020
    21 DIR=../../../SPOOLES.2.2
     21DIR=../../SPOOLES.2.2
    2222
    2323LIBS = \
    2424       $(DIR)/spooles.a \
    25         ../../../ARPACK/libarpack_INTEL.a \
     25       -larpack -lvecLibFort \
    2626       -lpthread -lm -lc
    2727
    28 ccx_2.18: $(OCCXMAIN) ccx_2.18.a  $(LIBS)
    29         ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
     28ccx_2.18: $(OCCXMAIN) ccx_2.18.a
     29        ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
    3030
    3131ccx_2.18.a: $(OCCXF) $(OCCXC)
  • ccx_2.18/src

    diff -u ccx_2.18/src.orig/cubtri.f ccx_2.18/src/cubtri.f
    old new  
    7777     &  mw,nfe
    7878      REAL*8 ALFA, ANS, ANSKP, AREA, EPS, ERR, ERRMAX, H, Q1, Q2, R1,R2,
    7979     * RDATA(1), D(2,4), S(4), T(2,3), VEC(2,3), W(6,NW), X(2),zero,
    80      & point5,one,rnderr
     80     & point5,one,F,rnderr
    8181C       ACTUAL DIMENSION OF W IS (6,NW/6)
    8282C
    8383      REAL*8 TANS, TERR, DZERO
  • ccx_2.18/src

    diff -u ccx_2.18/src.orig/date.pl ccx_2.18/src/date.pl
    old new  
    1313
    1414# inserting the date into ccx_2.18step.c
    1515
    16 @ARGV="ccx_2.18step.c";
     16@ARGV="CalculiXstep.c";
    1717$^I=".old";
    1818while(<>){
    1919    s/You are using an executable made on.*/You are using an executable made on $date\\n");/g;
     
    3030}
    3131
    3232system "rm -f ccx_2.18.c.old";
    33 system "rm -f ccx_2.18step.c.old";
     33system "rm -f CalculiXstep.c.old";
    3434system "rm -f frd.c.old";
  • premortar.c

    diff -u ccx_2.18/src.orig/premortar.c ccx_2.18/src/premortar.c
    old new  
    1919#include <math.h>
    2020#include <stdlib.h>
    2121#include <time.h>
     22#include <string.h>
    2223#include "CalculiX.h"
    2324#include "mortar.h"
    2425
  • resultsmech_us3.f

    diff -u ccx_2.18/src.orig/resultsmech_us3.f ccx_2.18/src/resultsmech_us3.f
    old new  
    461461     &     ihyper,istiff,elconloc,eth,kode,plicon,
    462462     &     nplicon,plkcon,nplkcon,npmat_,
    463463     &     plconloc,mi(1),dtime,k,
    464      &     xstiff,alcon)
     464     &     xstiff,ncmat_)
    465465          e     = elas(1)
    466466          un    = elas(2)
    467467          rho   = rhcon(1,1,imat)       
  • sensi_coor.c

    diff -u ccx_2.18/src.orig/sensi_coor.c ccx_2.18/src/sensi_coor.c
    old new  
    1818#include <stdio.h>
    1919#include <math.h>
    2020#include <stdlib.h>
     21#include <string.h>
    2122#include "CalculiX.h"
    2223
    2324void sensi_coor(double *co,ITG *nk,ITG **konp,ITG **ipkonp,char **lakonp,
  • sensi_orien.c

    diff -u ccx_2.18/src.orig/sensi_orien.c ccx_2.18/src/sensi_orien.c
    old new  
    1818#include <stdio.h>
    1919#include <math.h>
    2020#include <stdlib.h>
     21#include <string.h>
    2122#include "CalculiX.h"
    2223
    2324void sensi_orien(double *co,ITG *nk,ITG **konp,ITG **ipkonp,char **lakonp,
  • ccx_2.18/src

    diff -u ccx_2.18/src.orig/us4_sub.f ccx_2.18/src/us4_sub.f
    old new  
    454454      REAL*8, INTENT(IN)  :: X(4,3),rho,h             
    455455      REAL*8, INTENT(OUT) :: M(24,24)
    456456      REAL*8 :: ri,si,Nrs(4),dNr(4),dNs(4),Jm(2,2)
    457       REAL*8 :: invJm,detJm,detinvJm,dNx(4),dNy(4),q1
     457      REAL*8 :: invJm(2,2),detJm,detinvJm,dNx(4),dNy(4),q1
    458458      REAL*8 :: m_3t(6,6), N_u(6,24),g_p(4,3)
    459459      INTEGER :: k,j
    460460      !
  • CalculiXstep.c

    old new  
    261261   
    262262    clock_gettime(CLOCK_MONOTONIC, &totalCalculixTimeStart);
    263263
    264     if(argc==1){printf("Usage: CalculiX.exe -i jobname\n");FORTRAN(stop,());}
     264    if(argc==1){printf("Usage: ccx -i jobname\n");FORTRAN(stop,());}
    265265    else{
    266266      for(i=1;i<argc;i++){
    267267        if(strcmp1(argv[i],"-i")==0) {
  • ccx_2.18/src

    diff -ur ccx_2.18/src.orig/ccx_2.18.c ccx_2.18/src/ccx_2.18.c
    old new  
    115115
    116116  clock_gettime(CLOCK_MONOTONIC, &totalCalculixTimeStart);
    117117
    118   if(argc==1){printf("Usage: CalculiX.exe -i jobname\n");FORTRAN(stop,());}
     118  if(argc==1){printf("Usage: ccx -i jobname\n");FORTRAN(stop,());}
    119119  else{
    120120    for(i=1;i<argc;i++){
    121121      if(strcmp1(argv[i],"-i")==0){