]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix merge conflicts in SphericalManifold tests. 2926/head
authorDavid Wells <wellsd2@rpi.edu>
Sat, 6 Aug 2016 15:41:24 +0000 (11:41 -0400)
committerDavid Wells <wellsd2@rpi.edu>
Sat, 6 Aug 2016 16:17:16 +0000 (12:17 -0400)
tests/manifold/spherical_manifold_01.output
tests/manifold/spherical_manifold_02.output

index 0c42fdcfaaf09dd3a9f963fa051304a027be7d7e..9ecc5eec26b52b8f991d7ba3d5d54e667f5829b8 100644 (file)
@@ -1,6 +1,5 @@
 
 DEAL::=================================
-<<<<<<< HEAD
 DEAL::0.980785 0.195090
 DEAL::0.923880 0.382683
 DEAL::0.831470 0.555570
@@ -72,87 +71,10 @@ DEAL::0.490971 1.37094 1.37094
 DEAL::0.329189 1.39493 1.39493
 DEAL::0.165159 1.40938 1.40938
 DEAL::0.00000 1.41421 1.41421
-=======
-DEAL::0.195090 0.980785
-DEAL::0.382683 0.923880
-DEAL::0.555570 0.831470
-DEAL::0.707107 0.707107
-DEAL::0.831470 0.555570
-DEAL::0.923880 0.382683
-DEAL::0.980785 0.195090
-DEAL::=================================
-DEAL::0.831470 0.555570
-DEAL::0.923880 0.382683
-DEAL::0.980785 0.195090
-DEAL::0.707107 0.707107
-DEAL::0.195090 0.980785
-DEAL::0.382683 0.923880
-DEAL::0.555570 0.831470
-DEAL::=================================
-DEAL::=================================
-DEAL::0.195090 0.980785
-DEAL::0.382683 0.923880
-DEAL::0.555570 0.831470
-DEAL::0.707107 0.707107
-DEAL::0.831470 0.555570
-DEAL::0.923880 0.382683
-DEAL::0.980785 0.195090
-DEAL::=================================
-DEAL::0.831470 0.555570
-DEAL::0.923880 0.382683
-DEAL::0.980785 0.195090
-DEAL::0.707107 0.707107
-DEAL::0.195090 0.980785
-DEAL::0.382683 0.923880
-DEAL::0.555570 0.831470
-DEAL::=================================
-DEAL::=================================
-DEAL::0.195090 0.00000 0.980785
-DEAL::0.382683 0.00000 0.923880
-DEAL::0.555570 0.00000 0.831470
-DEAL::0.707107 0.00000 0.707107
-DEAL::0.831470 0.00000 0.555570
-DEAL::0.923880 0.00000 0.382683
-DEAL::0.980785 0.00000 0.195090
-DEAL::=================================
-DEAL::0.831470 0.00000 0.555570
-DEAL::0.923880 0.00000 0.382683
-DEAL::0.980785 0.00000 0.195090
-DEAL::0.707107 0.00000 0.707107
-DEAL::0.195090 0.00000 0.980785
-DEAL::0.382683 0.00000 0.923880
-DEAL::0.555570 0.00000 0.831470
-DEAL::=================================
-DEAL::=================================
-DEAL::1.22465e-16 1.41421 1.41421
-DEAL::0.165159 1.40938 1.40938
-DEAL::0.329189 1.39493 1.39493
-DEAL::0.490971 1.37094 1.37094
-DEAL::0.649399 1.33759 1.33759
-DEAL::0.803391 1.29510 1.29510
-DEAL::0.951895 1.24376 1.24376
-DEAL::1.09390 1.18393 1.18393
-DEAL::1.22843 1.11601 1.11601
-DEAL::1.35456 1.04047 1.04047
-DEAL::1.47145 0.957821 0.957821
-DEAL::1.57828 0.868628 0.868628
-DEAL::1.67433 0.773502 0.773502
-DEAL::1.75895 0.673091 0.673091
-DEAL::1.83155 0.568083 0.568083
-DEAL::1.89163 0.459194 0.459194
-DEAL::1.93880 0.347169 0.347169
-DEAL::1.97272 0.232772 0.232772
-DEAL::1.99317 0.116785 0.116785
-DEAL::2.00000 0.00000 0.00000
->>>>>>> origin/master
 DEAL::=================================
 DEAL::=================================
 DEAL::0.612372 0.612372 0.500000
 DEAL::0.612372 0.612372 0.500000
 DEAL::0.500000 0.612372 0.612372
-<<<<<<< HEAD
 DEAL::0.353553 0.353553 0.866025
-=======
-DEAL::0.612373 0.612373 0.500000
->>>>>>> origin/master
 DEAL::=================================
index 993eea71a119e41b2d78c51b24fe8c23b288b324..f06bc87579b0b33094f21a7f882ed9f5ac352435 100644 (file)
@@ -1,6 +1,5 @@
 
 DEAL::-----------------------------------
-<<<<<<< HEAD
 DEAL:: Ref      = 1      RelErr  = 0.0180739
 DEAL:: Ref      = 2      RelErr  = 0.00484274
 DEAL:: Ref      = 3      RelErr  = 0.00123590
@@ -16,15 +15,4 @@ DEAL:: Ref      = 4      RelErr  = -7.58070e-07
 DEAL:: Ref      = 5      RelErr  = -4.74089e-08
 DEAL:: Ref      = 6      RelErr  = -2.96380e-09
 DEAL:: Ref      = 7      RelErr  = -1.85254e-10
-=======
-DEAL::Grid has been saved into grid.vtk
-DEAL:: MappingManifold
-DEAL:: Surface area     = 12.5058
-DEAL::  Relative error  = -0.00481934
-DEAL::-----------------------------------
-DEAL::Grid has been saved into grid.vtk
-DEAL:: MappingQ
-DEAL:: Surface area     = 12.5664
-DEAL::  Relative error  = 4.23599e-09
->>>>>>> origin/master
 DEAL::-----------------------------------

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.