Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
François Trigaux
Cgebt
Commits
7b8b387e
Commit
7b8b387e
authored
Sep 15, 2021
by
François Trigaux
🤠
Browse files
🎨
changed many "beam" to "gebt"
parent
7b099e2a
Changes
23
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
7b8b387e
...
...
@@ -14,7 +14,7 @@ BINDIR=bin
LIBDIR
=
lib
# List of objects
OBJC
=
beam
.o
OBJC
=
gebt
.o
OBJF90
=
CPUtime.o GlobalDataFun.o TimeFunction.o PrescribedCondition.o InternalData.o Preprocess.o Element.o Member.o System.o Solve.o EigenSolve.o Analysis.o Wrappers.o
OBJF
=
ddep.o ma28.o mc19.o blas.o lapack.o arpack.o
...
...
run/CantileverEulerBeam/
Beam
.ini
→
run/CantileverEulerBeam/
Gebt
.ini
View file @
7b8b387e
File moved
run/CantileverEulerBeam/main.c
View file @
7b8b387e
#include
<stdlib.h>
#include
<stdio.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -18,8 +18,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
// Creating an array with the uniform load for each member
...
...
run/CantileverEulerBeam/readData.py
View file @
7b8b387e
...
...
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
nmemb
=
nkp
-
1
display
=
0
...
...
run/CantileverMoment/
Beam
.ini
→
run/CantileverMoment/
Gebt
.ini
View file @
7b8b387e
File moved
run/CantileverMoment/main.c
View file @
7b8b387e
#include
<stdlib.h>
#include
<stdio.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -19,8 +19,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
// Creating an array with the uniform load for each member
...
...
run/CantileverMoment/readData.py
View file @
7b8b387e
...
...
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
L
=
ini
.
getValue
(
"Beam"
,
"L"
,
typeCast
=
float
);
nmemb
=
nkp
-
1
...
...
run/DynEulerBeam/
Beam
.ini
→
run/DynEulerBeam/
Gebt
.ini
View file @
7b8b387e
File moved
run/DynEulerBeam/main.c
View file @
7b8b387e
#include
<stdlib.h>
#include
<stdio.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -18,8 +18,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
// Creating an array with the uniform load for each member
...
...
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
printf
(
"... Ok!
\n
"
);
}
free
Beam
(
bm
);
free
Gebt
(
bm
);
free
(
bm
);
return
EXIT_SUCCESS
;
...
...
run/DynEulerBeam/readData.py
View file @
7b8b387e
...
...
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
nmemb
=
nkp
-
1
display
=
1
...
...
run/NREL5MW_dynamic/
Beam
.ini
→
run/NREL5MW_dynamic/
Gebt
.ini
View file @
7b8b387e
File moved
run/NREL5MW_dynamic/main.c
View file @
7b8b387e
...
...
@@ -3,7 +3,7 @@
#include
<math.h>
#include
<time.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -13,8 +13,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
gebt_setTwistFromFile
(
bm
,
"Twist.dat"
);
...
...
@@ -51,10 +51,10 @@ int main(int argc, char* argv[])
printf
(
"... Ok!
\n
"
);
}
gebt_write
Beam
ToFile
(
bm
,
"beamFile.out"
);
gebt_write
Gebt
ToFile
(
bm
,
"beamFile.out"
);
free
(
loads
);
free
Beam
(
bm
);
free
Gebt
(
bm
);
free
(
bm
);
printf
(
"Mean time: %e"
,
meanTime
/
((
double
)
ntot
));
...
...
run/NREL5MW_dynamic/readData.py
View file @
7b8b387e
...
...
@@ -6,7 +6,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
L
=
ini
.
getValue
(
"Beam"
,
"L"
,
typeCast
=
float
);
dt
=
ini
.
getValue
(
"Beam"
,
"dt"
,
typeCast
=
float
);
...
...
run/NREL5MW_static/
Beam
.ini
→
run/NREL5MW_static/
Gebt
.ini
View file @
7b8b387e
File moved
run/NREL5MW_static/main.c
View file @
7b8b387e
...
...
@@ -2,7 +2,7 @@
#include
<stdio.h>
#include
<math.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -20,8 +20,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
gebt_setTwistFromFile
(
bm
,
"Twist.dat"
);
...
...
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
gebt_writeSolToFile
(
bm
,
fname
);
printf
(
"... Ok!
\n
"
);
free
Beam
(
bm
);
free
Gebt
(
bm
);
free
(
bm
);
return
EXIT_SUCCESS
;
...
...
run/NREL5MW_static/readData.py
View file @
7b8b387e
...
...
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
L
=
ini
.
getValue
(
"Beam"
,
"L"
,
typeCast
=
float
);
nmemb
=
nkp
-
1
...
...
run/TwistedBeam/
Beam
.ini
→
run/TwistedBeam/
Gebt
.ini
View file @
7b8b387e
File moved
run/TwistedBeam/main.c
View file @
7b8b387e
...
...
@@ -2,7 +2,7 @@
#include
<stdio.h>
#include
<math.h>
#include
"
beam
.h"
#include
"
gebt
.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -20,8 +20,8 @@ int main(int argc, char* argv[])
// Initializing the Beam
printf
(
"Initializing the beam...
\n
"
);
Beam
*
bm
=
malloc
(
sizeof
(
Beam
));
init
Beam
(
bm
);
Gebt
*
bm
=
malloc
(
sizeof
(
Gebt
));
init
Gebt
(
bm
);
printf
(
"...Done!
\n
"
);
/*double *twist = malloc(sizeof(double)*bm->nkp);
...
...
run/TwistedBeam/readData.py
View file @
7b8b387e
...
...
@@ -5,7 +5,7 @@ import matplotlib.pyplot as plt
from
readIni
import
IniReader
import
subprocess
as
sp
ini
=
IniReader
(
"
Beam
.ini"
);
ini
=
IniReader
(
"
Gebt
.ini"
);
nkp
=
ini
.
getValue
(
"Beam"
,
"nkp"
,
typeCast
=
int
);
L
=
ini
.
getValue
(
"Beam"
,
"L"
,
typeCast
=
float
);
nmemb
=
nkp
-
1
...
...
src/interface/beam_save.c
View file @
7b8b387e
...
...
@@ -3,13 +3,13 @@
#include
<math.h>
#include
"readINIFile.h"
#include
"
beam
.h"
#include
"
gebt
.h"
int
check
;
int
i_
,
j_
,
k_
;
// macro iterators
void
init
Beam
(
Beam
*
bm
)
void
init
Gebt
(
Gebt
*
bm
)
{
int
i
,
j
,
k
;
char
*
section
;
...
...
@@ -252,7 +252,7 @@ void initBeam(Beam *bm)
void
init
Beam
FromGebtFile
(
Beam
*
bm
)
void
init
Gebt
FromGebtFile
(
Gebt
*
bm
)
{
int
i
,
j
;
char
*
section
,
dataFileName
[
32
];
...
...
@@ -507,7 +507,7 @@ void initBeamFromGebtFile(Beam *bm)
// Assign the twist to each of the member by changing its frame
// twist_per_L [rad/arc length] is only required if there are subdivisions to the members
void
gebt_setTwist
(
Beam
*
bm
,
double
*
twist
)
void
gebt_setTwist
(
Gebt
*
bm
,
double
*
twist
)
{
int
i
;
double
k1
;
...
...
@@ -535,7 +535,7 @@ void gebt_setTwist(Beam *bm, double *twist)
// Assign the twist to each of the member by changing its frame
// twist_per_L [rad/arc length] is only required if there are subdivisions to the members
void
gebt_setTwistFromFile
(
Beam
*
bm
,
char
*
fname
)
void
gebt_setTwistFromFile
(
Gebt
*
bm
,
char
*
fname
)
{
int
i
,
j
,
k
;
int
idx
,
np
;
...
...
@@ -607,7 +607,7 @@ void gebt_setTwistFromFile(Beam *bm, char *fname)
}
void
gebt_writeSolToFile
(
Beam
*
bm
,
char
*
fileName
)
void
gebt_writeSolToFile
(
Gebt
*
bm
,
char
*
fileName
)
{
int
i
,
j
,
k
;
char
fname
[
32
];
...
...
@@ -646,7 +646,7 @@ void gebt_writeSolToFile(Beam *bm,char* fileName)
void
gebt_setLoads
(
Beam
*
bm
,
double
*
loads
,
int
load_no
)
void
gebt_setLoads
(
Gebt
*
bm
,
double
*
loads
,
int
load_no
)
{
int
i
;
for
(
i
=
0
;
i
<
bm
->
ncond_mb
;
i
++
)
...
...
@@ -662,7 +662,7 @@ void gebt_setLoads(Beam *bm, double *loads, int load_no)
}
}
void
gebt_setEndLoad
(
Beam
*
bm
,
double
loads
,
int
load_no
)
void
gebt_setEndLoad
(
Gebt
*
bm
,
double
loads
,
int
load_no
)
{
int
i
;
for
(
i
=
0
;
i
<
bm
->
ncond_mb
;
i
++
)
...
...
@@ -679,7 +679,7 @@ void gebt_setEndLoad(Beam *bm, double loads, int load_no)
}
void
gebt_analysis
(
Beam
*
bm
)
void
gebt_analysis
(
Gebt
*
bm
)
{
int
i
;
...
...
@@ -750,7 +750,7 @@ void gebt_analysis(Beam *bm)
/*
This updates the initial condition, but when the analysis does its initial step, it does not work
void gebt_updateInitialConditions(
Beam
*bm)
void gebt_updateInitialConditions(
Gebt
*bm)
{
int i,j;
for (i=0;i<bm->nelem;i++)
...
...
@@ -786,7 +786,7 @@ void gebt_updateInitialConditions(Beam *bm)
fprintf(fid,#type " ",ptr[i_][j_]);\
fprintf(fid,"\n");}
void
gebt_write
Beam
ToFile
(
Beam
*
bm
,
char
*
fname
)
void
gebt_write
Gebt
ToFile
(
Gebt
*
bm
,
char
*
fname
)
{
int
i
,
j
,
k
;
FILE
*
fid
=
fopen
(
fname
,
"w"
);
...
...
@@ -811,7 +811,7 @@ void gebt_writeBeamToFile(Beam *bm,char *fname)
}
void
free
Beam
(
Beam
*
bm
)
void
free
Gebt
(
Gebt
*
bm
)
{
printf
(
"Freeing the memory...
\n
"
);
...
...
@@ -890,7 +890,7 @@ static void gebt_interpolateMatrix(double **out, double x, double *xp, double **
static
void
gebt_setMaterial
(
Beam
*
bm
)
static
void
gebt_setMaterial
(
Gebt
*
bm
)
{
int
i
,
j
,
k
;
int
ncomp
,
nmass
;
...
...
@@ -976,7 +976,7 @@ static void gebt_setMaterial(Beam *bm)
static
void
gebt_setMaterial
(
Beam
*
bm
)
static
void
gebt_setMaterial
(
Gebt
*
bm
)
{
int
i
,
j
,
k
;
char
*
line
=
NULL
;
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment