traslado

nick0413 · Dec 4, 2023 · be3708d · be3708d
1 parent b85592e
commit be3708d
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 14 deletions.
diff --git a/proyecto/fores_fire_model/Makefile b/proyecto/fores_fire_model/Makefile
@@ -1,13 +1,13 @@
-all:  run
-	@echo "Corriendo el programa"
 
-compile:
+run: main.exe
+	@echo "Running the program"
+	./main.exe
+
+main.exe: forest_model.cpp
 	@echo "Compiling the program"
 	g++ -o main.exe forest_model.cpp -O3
 
-run: compile
-	@echo "Running the program"
-	./main.exe
+
 
 clean:
 	for %%X in (datos\*.bin) do del /Q "%%X"

diff --git a/proyecto/fores_fire_model/animate.ipynb b/proyecto/fores_fire_model/animate.ipynb
diff --git a/proyecto/fores_fire_model/forest_model.cpp b/proyecto/fores_fire_model/forest_model.cpp
@@ -7,12 +7,12 @@
 #include <string>
 
 std::ofstream datos;
-std::ofstream datos_new;
+std::ofstream config;
 
 std::string folder="datos";
 
-const int N_cells=4;
-
+const int N_cells=200;
+int t_max=500;
 /*
 El valor de una celda lo vamos a definir asi:
 c = 0: vacio
@@ -169,15 +169,28 @@ class Forest_model
 
 };
 
+void write_config(void)
+	{
+		config<<N_cells<<","<<t_max<< std::endl;
+
+	}
+
 
 int main(void)
 {	
 
 	Crandom rand64(1);
 	Forest_model forest(rand64,0.5,0.5);
 
+	config.open(folder+"/config.csv");
+	write_config();
+	config.close();
+
+
+
+
+
 
-	int t_max=100;
 	for(int time=0;time<t_max;time++)
 		{	
 

diff --git a/proyecto/fores_fire_model/main.exe b/proyecto/fores_fire_model/main.exe