Merge branch 'main' into pull_request_NR

Iddingsite · Jun 22, 2023 · 7713718 · 7713718
2 parents f7e2cc4 + 2d994fb
commit 7713718
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/PGE_function.c b/src/PGE_function.c
@@ -664,6 +664,7 @@ global_variable PGE_solver(		bulk_info 	 		 z_b,
 		// Solution (with transpose!)
 		char T = 'T';
 		dgetrs(						&T,
+
 									&nEntry, 
 									&nrhs, 
 									gv.A_PGE,

diff --git a/src/initialize.h b/src/initialize.h
@@ -204,7 +204,7 @@ global_variable global_variable_alloc( bulk_info  *z_b ){
 	gv.EM_database  	=  2; 					/** 0, metapelite; 1 metabasite; 2 igneous											*/
 	gv.n_points 		=  1;
 	gv.solver   		=  1;					/* 1 = PGE+Legacy, 2 = Legacy only */
-	gv.verbose 			=  0;
+	gv.verbose 		=  0;
 	gv.output_matlab 	=  0;
 	gv.test     		= -1;
 

diff --git a/src/simplex_levelling.c b/src/simplex_levelling.c
@@ -272,6 +272,7 @@ void update_global_gamma_LU( 				bulk_info 			z_b,
 	dgetrf(&d->n_Ox, &d->n_Ox, d->Alu, &d->n_Ox, ipiv, &info);
 
 	char T = 'T';
+
 	dgetrs(						&T,
 								&d->n_Ox, 
 								&nrhs, 
@@ -1619,4 +1620,4 @@ global_variable Levelling(	bulk_info 	z_b,
 	// }
 
 	return gv;
-};
+};