Merge branch 'master' of https://git.lemmasoftware.org/EMSchur3D

examples/EMSchur3D.cpp

@@ -54,6 +54,7 @@ int main( int argc, char** argv ) {
 
     //////////////////////////////////////////////////
     // Read in Layered earth, for backgound model
+<<<<<<< HEAD
 //     auto LayEarthRead = LayeredEarthEMReader::NewSP();
 //         try {
 //             LayEarthRead->ReadASCIIInputFile( argv[2] );
@@ -67,6 +68,23 @@ int main( int argc, char** argv ) {
 //                 GridRead->ReadASCIIGridFile( inp.c_str() );
 //             else exit(EXIT_FAILURE);
 // 	    }
+=======
+    /*
+    auto LayEarthRead = LayeredEarthEMReader::NewSP();
+        try {
+            LayEarthRead->ReadASCIIInputFile( argv[2] );
+        } catch (std::exception& e) {
+		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
+            std::cout << e.what() << std::endl;
+		    std::cout << "enter filename or 0 to exit programme\n";
+		    std::string inp;
+		    std::cin >> inp;
+		    if (inp != "0")
+                GridRead->ReadASCIIGridFile( inp.c_str() );
+            else exit(EXIT_FAILURE);
+	    }
+    */
+>>>>>>> bd2e3fa6b0dbb11555df9d4e7a7fe68e29b61ffd
 
     /*
     //////////////////////////////////////////////////