Added empty data folder; removed figures/ and cmd.txt; Print more dig…

…its for the dual value; fixed grammar
Geotomo · Jan 19, 2021 · fd09def · fd09def
1 parent bc94409
commit fd09def
Show file tree

Hide file tree

Showing 50 changed files with 5 additions and 7 deletions.
diff --git a/cmd.txt b/cmd.txt
diff --git a/figures/fig-0.png b/figures/fig-0.png
diff --git a/figures/fig-1.png b/figures/fig-1.png
diff --git a/figures/fig-10.png b/figures/fig-10.png
diff --git a/figures/fig-11.png b/figures/fig-11.png
diff --git a/figures/fig-12.png b/figures/fig-12.png
diff --git a/figures/fig-13.png b/figures/fig-13.png
diff --git a/figures/fig-14.png b/figures/fig-14.png
diff --git a/figures/fig-15.png b/figures/fig-15.png
diff --git a/figures/fig-16.png b/figures/fig-16.png
diff --git a/figures/fig-17.png b/figures/fig-17.png
diff --git a/figures/fig-18.png b/figures/fig-18.png
diff --git a/figures/fig-19.png b/figures/fig-19.png
diff --git a/figures/fig-2.png b/figures/fig-2.png
diff --git a/figures/fig-20.png b/figures/fig-20.png
diff --git a/figures/fig-21.png b/figures/fig-21.png
diff --git a/figures/fig-22.png b/figures/fig-22.png
diff --git a/figures/fig-23.png b/figures/fig-23.png
diff --git a/figures/fig-24.png b/figures/fig-24.png
diff --git a/figures/fig-25.png b/figures/fig-25.png
diff --git a/figures/fig-26.png b/figures/fig-26.png
diff --git a/figures/fig-27.png b/figures/fig-27.png
diff --git a/figures/fig-28.png b/figures/fig-28.png
diff --git a/figures/fig-29.png b/figures/fig-29.png
diff --git a/figures/fig-3.png b/figures/fig-3.png
diff --git a/figures/fig-30.png b/figures/fig-30.png
diff --git a/figures/fig-31.png b/figures/fig-31.png
diff --git a/figures/fig-32.png b/figures/fig-32.png
diff --git a/figures/fig-33.png b/figures/fig-33.png
diff --git a/figures/fig-34.png b/figures/fig-34.png
diff --git a/figures/fig-35.png b/figures/fig-35.png
diff --git a/figures/fig-36.png b/figures/fig-36.png
diff --git a/figures/fig-37.png b/figures/fig-37.png
diff --git a/figures/fig-38.png b/figures/fig-38.png
diff --git a/figures/fig-39.png b/figures/fig-39.png
diff --git a/figures/fig-4.png b/figures/fig-4.png
diff --git a/figures/fig-40.png b/figures/fig-40.png
diff --git a/figures/fig-5.png b/figures/fig-5.png
diff --git a/figures/fig-6.png b/figures/fig-6.png
diff --git a/figures/fig-7.png b/figures/fig-7.png
diff --git a/figures/fig-8.png b/figures/fig-8.png
diff --git a/figures/fig-9.png b/figures/fig-9.png
diff --git a/figures/initial-final-inc.png b/figures/initial-final-inc.png
diff --git a/figures/initial-final.png b/figures/initial-final.png
diff --git a/figures/output.gif b/figures/output.gif
diff --git a/src/BFMIncomp.h b/src/BFMIncomp.h
@@ -108,7 +108,7 @@ class BackAndForthIncompressible:public BackAndForth{
     }
 
     void display_iteration(const int iter,const double W2_value_,const double error_mu,const double error_nu,const double solution_error, const double C_phi_, const double C_psi_) const{
-        printf("%5d \tdual: %5.4f\tL1 error: %5.4f\n", iter+1, W2_value_,  error_mu);
+        printf("%5d \tdual value: %5.6f\tL1 error: %5.4f\n", iter+1, W2_value_,  error_mu);
         // printf("%5d C: %5.4f\tc1: %8.4f %8.4f\tc2: %8.4f %8.4f\tdual: %8.4f\tL1 error: %8.4f %8.4f\n", iter+1, C_phi_, phi_c1_, psi_c1_, phi_c2_, psi_c2_, W2_value_, error_mu, error_nu);
     }
 

diff --git a/src/BFMSlow.h b/src/BFMSlow.h
@@ -33,7 +33,7 @@ class BackAndForthSlow:public BackAndForth{
     }
 
     void display_iteration(const int iter,const double W2_value,const double error_mu,const double error_nu, const double C_phi, const double C_psi, const double infgradphi) const{
-        printf("%5d \tDual value: %5.4f\tL1 error: %5.4f\n", iter+1, W2_value,  error_mu);
+        printf("%5d \tdual value: %5.6f\tL1 error: %5.4f\n", iter+1, W2_value,  error_mu);
         // printf("%5d C: %5.4f\tc1: %8.4f %8.4f\tc2: %8.4f %8.4f\tdual: %8.4f\tL1 error: %8.4f %8.4f\n", iter+1, C_phi, phi_c1_, psi_c1_, phi_c2_, psi_c2_, W2_value, error_mu, error_nu);
     }
 

diff --git a/src/Helper_U.h b/src/Helper_U.h
@@ -36,7 +36,7 @@ class Helper_U{
 
         set_M_(mu);
 
-        cout << "The total mass : " << M_ << "\n";
+        cout << "Total mass : " << M_ << "\n";
     }
 
     virtual ~Helper_U(){

diff --git a/src/wgfinc.cpp b/src/wgfinc.cpp
@@ -143,7 +143,7 @@ void mexFunction( int nlhs, mxArray *plhs[],
     memcpy(result, mu, n1*n2*sizeof(double));
 
     time=clock()-time;
-    if(verbose>0) printf ("\nCPU time for GF: %f seconds.\n\n",((float)time)/CLOCKS_PER_SEC);
+    if(verbose>0) printf ("\nCPU time for GF: %.1f seconds.\n\n",((float)time)/CLOCKS_PER_SEC);
 
     delete[] input_char;
 }
diff --git a/src/wgfslow.cpp b/src/wgfslow.cpp
@@ -157,7 +157,7 @@ void mexFunction( int nlhs, mxArray *plhs[],
     memcpy(result, mu, n1*n2*sizeof(double));
 
     time=clock()-time;
-    if(verbose>0) printf ("\nCPU time for GF: %f seconds.\n\n",((float)time)/CLOCKS_PER_SEC);
+    if(verbose>0) printf ("\nCPU time for GF: %.1f seconds.\n\n",((float)time)/CLOCKS_PER_SEC);
 
     delete[] input_char;
 }