[cig-commits] [commit] master: Removed merge conflict from screen-output files (ba9a1a6)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/7f5bb2052fa860100b4201c16c844b5987ce4647...6ea7dc559fc7b64e0a243ed697a5eb2bbf36ee8e

>---------------------------------------------------------------

commit ba9a1a663600744498d3fda7422c404de529fa2e
Author: Jacky Austermann <jaustermann at fas.harvard.edu>
Date:   Fri Jun 6 16:13:14 2014 -0400

    Removed merge conflict from screen-output files


>---------------------------------------------------------------

ba9a1a663600744498d3fda7422c404de529fa2e
 tests/initial_condition_S20RTS/screen-output | 16 ----------------
 tests/initial_condition_S40RTS/screen-output | 16 ----------------
 2 files changed, 32 deletions(-)

diff --git a/tests/initial_condition_S20RTS/screen-output b/tests/initial_condition_S20RTS/screen-output
index 8d0c07e..31e5fa3 100644
--- a/tests/initial_condition_S20RTS/screen-output
+++ b/tests/initial_condition_S20RTS/screen-output
@@ -22,21 +22,6 @@ Termination requested by criterion: end time
 
 
 +---------------------------------------------+------------+------------+
-<<<<<<< HEAD
-| Total wallclock time elapsed since start    |      79.9s |            |
-|                                             |            |            |
-| Section                         | no. calls |  wall time | % of total |
-+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |      7.86s |       9.8% |
-| Assemble temperature system     |         1 |      3.34s |       4.2% |
-| Build Stokes preconditioner     |         1 |      4.52s |       5.7% |
-| Build temperature preconditioner|         1 |    0.0137s |     0.017% |
-| Solve Stokes system             |         1 |     0.562s |       0.7% |
-| Solve temperature system        |         1 |   0.00301s |    0.0038% |
-| Initialization                  |         2 |      60.9s |        76% |
-| Postprocessing                  |         1 |     0.289s |      0.36% |
-| Setup dof systems               |         1 |       1.3s |       1.6% |
-=======
 | Total wallclock time elapsed since start    |        80s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
@@ -50,6 +35,5 @@ Termination requested by criterion: end time
 | Initialization                  |         2 |        61s |        76% |
 | Postprocessing                  |         1 |     0.345s |      0.43% |
 | Setup dof systems               |         1 |      1.29s |       1.6% |
->>>>>>> 59eb95b... Updated tests
 +---------------------------------+-----------+------------+------------+
 
diff --git a/tests/initial_condition_S40RTS/screen-output b/tests/initial_condition_S40RTS/screen-output
index 5dc2a71..f75d706 100644
--- a/tests/initial_condition_S40RTS/screen-output
+++ b/tests/initial_condition_S40RTS/screen-output
@@ -22,21 +22,6 @@ Termination requested by criterion: end time
 
 
 +---------------------------------------------+------------+------------+
-<<<<<<< HEAD
-| Total wallclock time elapsed since start    |       313s |            |
-|                                             |            |            |
-| Section                         | no. calls |  wall time | % of total |
-+---------------------------------+-----------+------------+------------+
-| Assemble Stokes system          |         1 |      7.85s |       2.5% |
-| Assemble temperature system     |         1 |      3.34s |       1.1% |
-| Build Stokes preconditioner     |         1 |      4.62s |       1.5% |
-| Build temperature preconditioner|         1 |    0.0134s |    0.0043% |
-| Solve Stokes system             |         1 |     0.559s |      0.18% |
-| Solve temperature system        |         1 |   0.00303s |   0.00097% |
-| Initialization                  |         2 |       294s |        94% |
-| Postprocessing                  |         1 |     0.309s |     0.099% |
-| Setup dof systems               |         1 |      1.31s |      0.42% |
-=======
 | Total wallclock time elapsed since start    |       278s |            |
 |                                             |            |            |
 | Section                         | no. calls |  wall time | % of total |
@@ -50,6 +35,5 @@ Termination requested by criterion: end time
 | Initialization                  |         2 |       259s |        93% |
 | Postprocessing                  |         1 |     0.363s |      0.13% |
 | Setup dof systems               |         1 |       1.3s |      0.47% |
->>>>>>> 59eb95b... Updated tests
 +---------------------------------+-----------+------------+------------+