T-bone 6 anos atrás
pai
commit
90aa2b0d4b
1 arquivos alterados com 18 adições e 0 exclusões
  1. 18
    0
      examples/EMSchur3D.cpp

+ 18
- 0
examples/EMSchur3D.cpp Ver arquivo

@@ -54,6 +54,7 @@ int main( int argc, char** argv ) {
54 54
 
55 55
     //////////////////////////////////////////////////
56 56
     // Read in Layered earth, for backgound model
57
+<<<<<<< HEAD
57 58
 //     auto LayEarthRead = LayeredEarthEMReader::NewSP();
58 59
 //         try {
59 60
 //             LayEarthRead->ReadASCIIInputFile( argv[2] );
@@ -67,6 +68,23 @@ int main( int argc, char** argv ) {
67 68
 //                 GridRead->ReadASCIIGridFile( inp.c_str() );
68 69
 //             else exit(EXIT_FAILURE);
69 70
 // 	    }
71
+=======
72
+    /*
73
+    auto LayEarthRead = LayeredEarthEMReader::NewSP();
74
+        try {
75
+            LayEarthRead->ReadASCIIInputFile( argv[2] );
76
+        } catch (std::exception& e) {
77
+		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
78
+            std::cout << e.what() << std::endl;
79
+		    std::cout << "enter filename or 0 to exit programme\n";
80
+		    std::string inp;
81
+		    std::cin >> inp;
82
+		    if (inp != "0")
83
+                GridRead->ReadASCIIGridFile( inp.c_str() );
84
+            else exit(EXIT_FAILURE);
85
+	    }
86
+    */
87
+>>>>>>> bd2e3fa6b0dbb11555df9d4e7a7fe68e29b61ffd
70 88
 
71 89
     /*
72 90
     //////////////////////////////////////////////////

Carregando…
Cancelar
Salvar