Bladeren bron

merge fix

master
Trevor Irons 6 jaren geleden
bovenliggende
commit
dedd5ff962
2 gewijzigde bestanden met toevoegingen van 2 en 21 verwijderingen
  1. 1
    20
      examples/EMSchur3D.cpp
  2. 1
    1
      include/EMSchur3D.h

+ 1
- 20
examples/EMSchur3D.cpp Bestand weergeven

@@ -54,22 +54,6 @@ int main( int argc, char** argv ) {
54 54
 
55 55
     //////////////////////////////////////////////////
56 56
     // Read in Layered earth, for backgound model
57
-<<<<<<< HEAD
58
-//     auto LayEarthRead = LayeredEarthEMReader::NewSP();
59
-//         try {
60
-//             LayEarthRead->ReadASCIIInputFile( argv[2] );
61
-//         } catch (std::exception& e) {
62
-// 		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
63
-//             std::cout << e.what() << std::endl;
64
-// 		    std::cout << "enter filename or 0 to exit programme\n";
65
-// 		    std::string inp;
66
-// 		    std::cin >> inp;
67
-// 		    if (inp != "0")
68
-//                 GridRead->ReadASCIIGridFile( inp.c_str() );
69
-//             else exit(EXIT_FAILURE);
70
-// 	    }
71
-=======
72
-    /*
73 57
     auto LayEarthRead = LayeredEarthEMReader::NewSP();
74 58
         try {
75 59
             LayEarthRead->ReadASCIIInputFile( argv[2] );
@@ -83,10 +67,7 @@ int main( int argc, char** argv ) {
83 67
                 GridRead->ReadASCIIGridFile( inp.c_str() );
84 68
             else exit(EXIT_FAILURE);
85 69
 	    }
86
-    */
87
->>>>>>> bd2e3fa6b0dbb11555df9d4e7a7fe68e29b61ffd
88 70
 
89
-    /*
90 71
     //////////////////////////////////////////////////
91 72
     // Read in source specification
92 73
     auto AEMRead = AEMSurveyReader::NewSP();
@@ -102,7 +83,7 @@ int main( int argc, char** argv ) {
102 83
                 AEMRead->ReadASCIIAEMFile( inp.c_str() );
103 84
             else exit(EXIT_FAILURE);
104 85
 	    }
105
-    */
86
+
106 87
 
107 88
     /*
108 89
     //////////////////////////////////////////////////

+ 1
- 1
include/EMSchur3D.h Bestand weergeven

@@ -37,7 +37,7 @@ namespace Lemma {
37 37
     class EMSchur3D : public EMSchur3DBase {
38 38
 
39 39
         friend std::ostream &operator << (std::ostream &stream, const EMSchur3D &ob) {
40
-            stream << ob.Serialize()  << "\n---\n"; // End of doc
40
+            stream << ob.Serialize()  << "\n"; // End of doc
41 41
             return stream;
42 42
         }
43 43
 

Laden…
Annuleren
Opslaan