Home Explore Help
Sign In
nico
/
HDPG1D
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixed readme

Snow 8 years ago
parent
95214ab0b6 0a53d11d56
commit
96c611e0f7
1 changed files with 4 additions and 0 deletions
Unified View Show Diff Stats
  1. 4 0
      README.md

+ 4 - 0
README.md
View File 

@@ -28,7 +28,11 @@ In terminal, call:
 
 ```bash
 
 ```bash
 
 PGsolve
 
 PGsolve
 
 ```
 
 ```
 
+<<<<<<< HEAD
 
 Follow the prompts to setup the problem, visualize the solution, and finally check the convergence.
 
 Follow the prompts to setup the problem, visualize the solution, and finally check the convergence.
 
+=======
 
+Follow the prompts to setup the problem, visualize the solution, and check the convergence plot.
 
+>>>>>>> v3.0.1-hotfix
 
 
 
 ### Convergence plot
 
 ### Convergence plot
 
 The error on the convergence plot is calculated using approximated 'exact' solution with higher polynomial functions and large number of elements. Therefore, the error plot, especially the adaptive solution error, may not be accurate after certain error threshold.
 
 The error on the convergence plot is calculated using approximated 'exact' solution with higher polynomial functions and large number of elements. Therefore, the error plot, especially the adaptive solution error, may not be accurate after certain error threshold.