Commit 7b8b387e authored by François Trigaux's avatar François Trigaux
Browse files

🎨 changed many "beam" to "gebt"

parent 7b099e2a
......@@ -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
......
#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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(bm);
printf("...Done!\n");
// Creating an array with the uniform load for each member
......
......@@ -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
......
#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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(bm);
printf("...Done!\n");
// Creating an array with the uniform load for each member
......
......@@ -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
......
#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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(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");
}
freeBeam(bm);
freeGebt(bm);
free(bm);
return EXIT_SUCCESS;
......
......@@ -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
......
......@@ -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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(bm);
printf("...Done!\n");
gebt_setTwistFromFile(bm,"Twist.dat");
......@@ -51,10 +51,10 @@ int main(int argc, char* argv[])
printf("... Ok! \n");
}
gebt_writeBeamToFile(bm,"beamFile.out");
gebt_writeGebtToFile(bm,"beamFile.out");
free(loads);
freeBeam(bm);
freeGebt(bm);
free(bm);
printf("Mean time: %e",meanTime/((double)ntot));
......
......@@ -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);
......
......@@ -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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(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");
freeBeam(bm);
freeGebt(bm);
free(bm);
return EXIT_SUCCESS;
......
......@@ -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
......
......@@ -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));
initBeam(bm);
Gebt *bm = malloc(sizeof(Gebt));
initGebt(bm);
printf("...Done!\n");
/*double *twist = malloc(sizeof(double)*bm->nkp);
......
......@@ -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
......
......@@ -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 initBeam(Beam *bm)
void initGebt(Gebt *bm)
{
int i,j,k;
char *section;
......@@ -252,7 +252,7 @@ void initBeam(Beam *bm)
void initBeamFromGebtFile(Beam *bm)
void initGebtFromGebtFile(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_writeBeamToFile(Beam *bm,char *fname)
void gebt_writeGebtToFile(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 freeBeam(Beam *bm)
void freeGebt(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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment