Browse Source

merge fix

master
Trevor Irons 6 years ago
parent
commit
dedd5ff962
2 changed files with 2 additions and 21 deletions
  1. 1
    20
      examples/EMSchur3D.cpp
  2. 1
    1
      include/EMSchur3D.h

+ 1
- 20
examples/EMSchur3D.cpp View File

54
 
54
 
55
     //////////////////////////////////////////////////
55
     //////////////////////////////////////////////////
56
     // Read in Layered earth, for backgound model
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
     auto LayEarthRead = LayeredEarthEMReader::NewSP();
57
     auto LayEarthRead = LayeredEarthEMReader::NewSP();
74
         try {
58
         try {
75
             LayEarthRead->ReadASCIIInputFile( argv[2] );
59
             LayEarthRead->ReadASCIIInputFile( argv[2] );
83
                 GridRead->ReadASCIIGridFile( inp.c_str() );
67
                 GridRead->ReadASCIIGridFile( inp.c_str() );
84
             else exit(EXIT_FAILURE);
68
             else exit(EXIT_FAILURE);
85
 	    }
69
 	    }
86
-    */
87
->>>>>>> bd2e3fa6b0dbb11555df9d4e7a7fe68e29b61ffd
88
 
70
 
89
-    /*
90
     //////////////////////////////////////////////////
71
     //////////////////////////////////////////////////
91
     // Read in source specification
72
     // Read in source specification
92
     auto AEMRead = AEMSurveyReader::NewSP();
73
     auto AEMRead = AEMSurveyReader::NewSP();
102
                 AEMRead->ReadASCIIAEMFile( inp.c_str() );
83
                 AEMRead->ReadASCIIAEMFile( inp.c_str() );
103
             else exit(EXIT_FAILURE);
84
             else exit(EXIT_FAILURE);
104
 	    }
85
 	    }
105
-    */
86
+
106
 
87
 
107
     /*
88
     /*
108
     //////////////////////////////////////////////////
89
     //////////////////////////////////////////////////

+ 1
- 1
include/EMSchur3D.h View File

37
     class EMSchur3D : public EMSchur3DBase {
37
     class EMSchur3D : public EMSchur3DBase {
38
 
38
 
39
         friend std::ostream &operator << (std::ostream &stream, const EMSchur3D &ob) {
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
             return stream;
41
             return stream;
42
         }
42
         }
43
 
43
 

Loading…
Cancel
Save