a) patch-cgx_1.0+src+readcxx.c is not needed anymore since we
fixed the spooles port b) there are three (small) missing patches from the experimental tree that are not in the files dir. Submitted by: "Pedro F. Giffuni" <giffunip@yahoo.com> Reviewed by: maho
This commit is contained in:
Maho Nakata
parent
352d974abd
commit
2d3aaf068c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=84725
11
cad/calculix/files/patch-ccx_1.0+src+ccx_1.0.c
Normal file
11
cad/calculix/files/patch-ccx_1.0+src+ccx_1.0.c
Normal file
@ -0,0 +1,11 @@
|
||||
--- ccx_1.0/src/ccx_1.0.c.orig Sun Jun 22 00:33:19 2003
|
||||
+++ ccx_1.0/src/ccx_1.0.c Sun Jun 22 00:41:18 2003
|
||||
@@ -694,6 +694,8 @@
|
||||
mastruct(&nk,kon,ipkon,lakon,&ne,nodeboun,ndirboun,&nboun,ipompc,
|
||||
nodempc,&nmpc,nactdof,icol,jq,&mast1,&irow,&isolver,&neq,nnn,
|
||||
ikmpc,ilmpc,ikcol,ipointer,&nsky,&nzs,&nmethod);
|
||||
+ } else {
|
||||
+ neq = 1;
|
||||
}
|
||||
}
|
||||
else{
|
||||
10
cad/calculix/files/patch-ccx_1.0+src+profil.f
Normal file
10
cad/calculix/files/patch-ccx_1.0+src+profil.f
Normal file
@ -0,0 +1,10 @@
|
||||
--- ccx_1.0/src/profil.f.orig Sun Jun 22 00:32:56 2003
|
||||
+++ ccx_1.0/src/profil.f Sun Jun 22 00:38:14 2003
|
||||
@@ -31,6 +31,7 @@
|
||||
do 20 i=1,n
|
||||
jstrt=xadj(i)
|
||||
jstop=xadj(i+1)-1
|
||||
+ if(jstrt.gt.jstop) cycle
|
||||
oldmin=adj(jstrt)
|
||||
newmin=nnn(adj(jstrt))
|
||||
!
|
||||
21
cad/calculix/files/patch-cgx_1.0+src+cgx.h
Normal file
21
cad/calculix/files/patch-cgx_1.0+src+cgx.h
Normal file
@ -0,0 +1,21 @@
|
||||
--- cgx_1.0/src/cgx.h.orig Mon Apr 7 14:28:01 2003
|
||||
+++ cgx_1.0/src/cgx.h Thu May 8 13:25:32 2003
|
||||
@@ -46,14 +46,14 @@
|
||||
#define MILLISECONDS_PER_PERIOD 1200
|
||||
|
||||
/* default location of the help files, please insert the actual one */
|
||||
-#define HELPFILE {"/usr/local/CalculiX/cgx_1.0/doc/cgx/cgx.html",\
|
||||
- "/usr/local/CalculiX/ccx_1.0/doc/ccx/ccx.html"}
|
||||
+#define HELPFILE {"%%DOCSDIR%%/cgx/cgx.html",\
|
||||
+ "%%DOCSDIR%%/ccx/ccx.html"}
|
||||
|
||||
/* html browser, change if necessary */
|
||||
-#define BROWSER {"netscape"}
|
||||
+#define BROWSER {"mozilla"}
|
||||
|
||||
/* postscript viewer, change if necessary */
|
||||
-#define PSVIEWER {"ghostview"}
|
||||
+#define PSVIEWER {"gv"}
|
||||
|
||||
/* more parameters, better do not change them! */
|
||||
#define MINVALUE -1.e9
|
||||
@ -1,127 +0,0 @@
|
||||
--- cgx_1.0/src/readccx.c.orig Wed Apr 9 00:32:46 2003
|
||||
+++ cgx_1.0/src/readccx.c Sat May 10 09:17:36 2003
|
||||
@@ -357,7 +357,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"NAME=",5)==5) { strcpy(set,&buffer[5]); }
|
||||
}
|
||||
if(printFlag) printf("*SURFACE DEFINITION: %s\n",set);
|
||||
@@ -479,7 +479,7 @@
|
||||
|
||||
|
||||
/* check if it is a node section */
|
||||
- for(j=0;j<strlen(rec_str); j++) { if(rec_str[j]==',') break; rec_str[j]=_toupper(rec_str[j]);}
|
||||
+ for(j=0;j<strlen(rec_str); j++) { if(rec_str[j]==',') break; rec_str[j]=toupper(rec_str[j]);}
|
||||
if((compare(rec_str,"*NODE PRINT",11)==11)||
|
||||
(compare(rec_str,"*NODE FILE",10)==10))
|
||||
{
|
||||
@@ -500,7 +500,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"NSET=",5)==5) { setFlag=1; strcpy(set,&buffer[5]); }
|
||||
}
|
||||
if(printFlag) printf("*NODE: NSET=%s\n", set);
|
||||
@@ -815,7 +815,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"TYPE=",5)==5) strcpy(elemtyp,&buffer[5]);
|
||||
if(compare(dat[i],"ELSET=",6)==6) { strcpy(set,&buffer[6]); setFlag=1; }
|
||||
}
|
||||
@@ -977,7 +977,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"NAME=",5)==5) strcpy(mname,&buffer[5]);
|
||||
}
|
||||
if(printFlag) printf("*MATERIAL:%s\n", mname);
|
||||
@@ -1021,7 +1021,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"TYPE=",5)==5) strcpy(type,&buffer[5]);
|
||||
}
|
||||
if(printFlag) printf("*ELASTIC: TYPE:%s\n", type);
|
||||
@@ -1073,7 +1073,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"TYPE=",5)==5) strcpy(type,&buffer[5]);
|
||||
}
|
||||
if(printFlag) printf("*EXPANSION:TYPE:%s\n", type);
|
||||
@@ -1480,7 +1480,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"ELSET=",6)==6) strcpy(set,&buffer[6]);
|
||||
if(compare(dat[i],"GENERATE",5)==5) generate=1;
|
||||
}
|
||||
@@ -1537,7 +1537,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"NSET=",5)==5) strcpy(set,&buffer[5]);
|
||||
if(compare(dat[i],"GENERATE",5)==5) generate=1;
|
||||
}
|
||||
@@ -1605,7 +1605,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"ELSET=",6)==6) strcpy(elset,&buffer[6]);
|
||||
if(compare(dat[i],"MATERIAL=",9)==9) strcpy(material,&buffer[9]);
|
||||
if((compare(buffer,"NODAL",5)==5)||
|
||||
@@ -1672,7 +1672,7 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"ELSET=",6)==6) strcpy(elset,&buffer[6]);
|
||||
if(compare(dat[i],"MATERIAL=",9)==9) strcpy(material,&buffer[9]);
|
||||
if((compare(buffer,"COMPOS",5)==5)||
|
||||
@@ -1726,14 +1726,14 @@
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"TYPE=",5)==5)
|
||||
{
|
||||
strcpy(dat[i],&buffer[5]);
|
||||
/* delete blanks */
|
||||
n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
|
||||
buffer[n]=(unsigned char)NULL;
|
||||
- for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
|
||||
+ for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
|
||||
if(compare(dat[i],"TEMPERATURE",6)==6)
|
||||
{
|
||||
if(printFlag) printf("*INITIAL CONDITIONS: TYPE:%s \n", buffer);
|
||||
@@ -1914,7 +1914,7 @@
|
||||
args=crecord(rec_str, dat);
|
||||
|
||||
/* get the arguments of the string */
|
||||
- i=0; while(dat[0][i]!=(unsigned char)NULL) { dat[0][i]=_toupper(dat[0][i]); i++; }
|
||||
+ i=0; while(dat[0][i]!=(unsigned char)NULL) { dat[0][i]=toupper(dat[0][i]); i++; }
|
||||
|
||||
/* get the nodes */
|
||||
if (compare(dat[0], "*NODE",5)==5) { length=getNodes(rec_str); goto checknextstr; }
|
||||
Loading…
Reference in New Issue
Block a user