diff --git a/README.md b/README.md index 5cbef6353940175ed36b4dc73a84e10396c9bc20..3ec39d85d650732f7b3a8bf922998881ada23b94 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# PAP - +# PAP - Projet equation de la chaleur +## CAZENAVE Clement & SAMLALI Youssef diff --git a/tab.h b/includes/tab.h similarity index 91% rename from tab.h rename to includes/tab.h index ddf29dc180eb5c3903cbad738a950906245470d0..c0446e14aa4f637b6941c035afde7bc245dd62f7 100644 --- a/tab.h +++ b/includes/tab.h @@ -37,7 +37,7 @@ class Materiaux }; -int** settab(Materiaux mat, int m, int n , int u0,double T, double L, double f); +int** settab(Materiaux mat, int m, int n , int u0,double T, double f); #endif diff --git a/main.cpp b/main.cpp deleted file mode 100644 index fff7e66c5a1dc3560b4c0193141c4d61a8d80dfd..0000000000000000000000000000000000000000 --- a/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// A simple call_scilab example - -#include <stdio.h> /* stderr */ -#include <stdlib.h> - -#include "call_scilab.h" /* Provide functions to call Scilab engine */ -/* Provide functions to access to the memory of Scilab */ - -// Filename: simple_call_scilab.c - -int main(void) -{ -/****** INITIALIZATION **********/ -#ifdef _MSC_VER - if ( StartScilab(NULL,NULL,NULL) == FALSE ) -#else - if ( StartScilab(getenv("SCI"),NULL,NULL) == FALSE ) -#endif - { - fprintf(stderr,"Error while calling StartScilab\n"); - return -1; - } - -/****** ACTUAL Scilab TASKS *******/ - - SendScilabJob("myMatrix=['sample','for the help']"); - SendScilabJob("disp(myMatrix);"); // Will display !sample for the help ! - SendScilabJob("disp([2,3]+[-44,39]);"); // Will display - 42. 42. - -/****** TERMINATION **********/ - if ( TerminateScilab(NULL) == FALSE ) { - fprintf(stderr,"Error while calling TerminateScilab\n"); - return -2; - } - return 0; -} diff --git a/makefile b/makefile new file mode 100644 index 0000000000000000000000000000000000000000..0a5a158c872b4b3920ede42b4893571d8d908dbb --- /dev/null +++ b/makefile @@ -0,0 +1,9 @@ +all: src + +src: + $(MAKE) -C src + +.PHONY: clean src + +clean: + $(MAKE) -C src clean diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8effd52f8222cc1d8f978f9b69b69e376e46bef2 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,23 @@ +#include <iostream> +#include <limits> +#include <iomanip> +#include "../includes/tab.h" + +using namespace std; + +int main(){ + +Materiaux cuivre = Materiaux(389, 8940,380); +Materiaux fer= Materiaux (80.2,7874,440); +Materiaux verre= Materiaux(1.2,2530,840); +Materiaux polystyrene= Materiaux(0.1,1040,1200); + +int ** u_cuivre = settab(cuivre, 100,100,253,1,600); +int ** u_fer = settab(fer, 100,100,253,1,600); +int ** u_verre = settab(verre, 100,100,253,1,600); +int ** u_polystyrene = settab(polystyrene, 100,100,253,1,600); +cout<<u_cuivre<<u_fer<<u_polystyrene<<u_verre<<endl; + +return 0; +} + diff --git a/src/makefile b/src/makefile new file mode 100644 index 0000000000000000000000000000000000000000..ed7c3ef0b6709183e6e92419e7df10d36e056ec6 --- /dev/null +++ b/src/makefile @@ -0,0 +1,19 @@ +CC = g++ +CPPFLAGS = -std=c++11 -Wall -Wextra -Werror +INCLUDES=../includes +TARGET = ../main + +OBJS = main.o tab.o +all: $(TARGET) + + +$(TARGET): $(OBJS) + $(CC) $(LDFLAGS) $^ -o $@ + + %.o: %.cpp $(INCLUDES)%.h + $(CC) $(CPPFLAGS) $< -c -o $@ $< + +.PHONY: clean +clean: + rm -f $(OBJS) + rm -f $(TARGET) diff --git a/tab.cpp b/src/tab.cpp similarity index 75% rename from tab.cpp rename to src/tab.cpp index b6efde9904b5aed77f035e177d981d0b6b552530..b9831573915c835dee31bae48f8ad37e1fc7fa76 100644 --- a/tab.cpp +++ b/src/tab.cpp @@ -1,7 +1,7 @@ #include <iostream> #include <limits> #include <iomanip> -#include "tab.h" +#include "../includes/tab.h" using namespace std; typedef std::numeric_limits< double > dbl; @@ -15,7 +15,7 @@ Materiaux::Materiaux(double lambda, double kho, double c) -int** settab(Materiaux mat, int m, int n , int u0,double T, double L, double f) +int** settab(Materiaux mat, int m, int n , int u0,double T,double f) { double dt, dx; dt= T/100.; @@ -61,14 +61,3 @@ int** settab(Materiaux mat, int m, int n , int u0,double T, double L, double f) } -int main(){ - -Materiaux cuivre = Materiaux(389, 8940,380); -Materiaux fer= Materiaux (80.2,7874,440); -Materiaux verre= Materiaux(1.2,2530,840); -Materiaux polystyrene= Materiaux(0.1,1040,1200); - -int ** s = settab(cuivre, 100,100,253,16,1,600); - -return 0; -}