Merge pull request #419 from PrincetonUniversity/issue-411

examples/anisotropic-crystal/CMakeFiles/Snakefile.in

@@ -30,7 +30,7 @@ rule run_solver:
         config="specfem_config.yaml",
     output:
         seismograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0010",
                 "S0020",
@@ -59,7 +59,7 @@ rule run_solver:
 rule plot_seismogram:
     input:
         trace_files=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0010",
                 "S0020",
@@ -91,16 +91,21 @@ rule plot_seismogram:
                 "S0040",
                 "S0050",
             ]
+
             files = [glob.glob(directory + f"/{stationname}*.sem*")[0] for stationname in station_name]
 
             ## iterate over all seismograms
             for filename in files:
                 station_id = os.path.splitext(filename)[0]
                 station_id = station_id.split("/")[-1]
+                # -------------------------
+                # FIX ME PLEASE!!!!!!!!!!!!
                 network = station_id[5:7]
                 station = station_id[0:5]
                 location = "00"
                 component = station_id[7:10]
+                # FIX ME PLEASE!!!!!!!!!!!!
+                # -------------------------
                 trace = np.loadtxt(filename, delimiter=" ")
                 starttime = trace[0, 0]
                 dt = trace[1, 0] - trace[0, 0]

examples/fluid-solid-bathymetry/Snakefile

@@ -53,7 +53,7 @@ rule run_simulation:
         specfem_config="specfem_config.yaml",
     output:
         pressure_seismograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semp",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semp",
             station_name=[
                 "S0001",
                 "S0002",
@@ -79,7 +79,7 @@ rule run_simulation:
 rule plot_seismogram:
     input:
         pressure_seismograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semp",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semp",
             station_name=[
                 "S0001",
                 "S0002",
@@ -106,14 +106,18 @@ rule plot_seismogram:
             ## iterate over all seismograms
             for filename in files:
                 station_name = os.path.splitext(filename)[0]
-                station_name = station_name.split("/")[-1]
+                network, station, location, channel = station_name.split("/")[-1].split(".")
                 trace = np.loadtxt(filename, delimiter=" ")
                 starttime = trace[0, 0]
                 dt = trace[1, 0] - trace[0, 0]
                 traces.append(
                     obspy.Trace(
                         trace[:, 1],
-                        {"network": station_name, "starttime": starttime, "delta": dt},
+                        {"network": network,
+                         "station": station,
+                         "location": location,
+                         "channel": channel,
+                         "starttime": starttime, "delta": dt},
                     )
                 )
 

examples/fluid-solid-interface/Snakefile

@@ -30,7 +30,7 @@ rule run_solver:
         config="specfem_config.yaml",
     output:
         seismograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0001",
                 "S0002",
@@ -65,7 +65,7 @@ rule run_solver:
 rule plot_seismogram:
     input:
         trace_files=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0001",
                 "S0002",
@@ -102,14 +102,18 @@ rule plot_seismogram:
             ## iterate over all seismograms
             for filename in files:
                 station_name = os.path.splitext(filename)[0]
-                station_name = station_name.split("/")[-1]
+                network, station, location, channel = station_name.split("/")[-1].split(".")
                 trace = np.loadtxt(filename, delimiter=" ")
                 starttime = trace[0, 0]
                 dt = trace[1, 0] - trace[0, 0]
                 traces.append(
                     obspy.Trace(
                         trace[:, 1],
-                        {"network": station_name, "starttime": starttime, "delta": dt},
+                        {"network": network,
+                         "station": station,
+                         "location": location,
+                         "channel": channel,
+                         "starttime": starttime, "delta": dt},
                     )
                 )
 

examples/homogeneous-medium-flat-topography/Snakefile

@@ -30,7 +30,7 @@ rule run_solver:
         config="specfem_config.yaml",
     output:
         siesmograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semv",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semv",
             station_name=["S0001", "S0002", "S0003", "S0004", "S0005", "S0006"],
             network_name=["AA"],
             component=["BXX", "BXZ"],
@@ -53,7 +53,7 @@ rule run_solver:
 rule plot_seismogram:
     input:
         trace_files=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semv",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semv",
             station_name=["S0001", "S0002", "S0003", "S0004", "S0005", "S0006"],
             network_name=["AA"],
             component=["BXX", "BXZ"],
@@ -77,14 +77,17 @@ rule plot_seismogram:
             ## iterate over all seismograms
             for filename in files:
                 station_name = os.path.splitext(filename)[0]
-                station_name = station_name.split("/")[-1]
+                network, station, location, channel = station_name.split("/")[-1].split(".")
                 trace = np.loadtxt(filename, delimiter=" ")
                 starttime = trace[0, 0]
                 dt = trace[1, 0] - trace[0, 0]
                 traces.append(
                     obspy.Trace(
                         trace[:, 1],
-                        {"network": station_name, "starttime": starttime, "delta": dt},
+                        {"network": network,
+                         "station": station,
+                         "location": location,
+                         "channel": channel, "starttime": starttime, "delta": dt},
                     )
                 )
 

examples/solid-solid-interface/Snakefile

@@ -30,7 +30,7 @@ rule run_solver:
         config="specfem_config.yaml",
     output:
         seismograms=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0001",
             ],
@@ -55,7 +55,7 @@ rule run_solver:
 rule plot_seismogram:
     input:
         trace_files=expand(
-            "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd",
+            "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd",
             station_name=[
                 "S0001",
             ],
@@ -82,14 +82,18 @@ rule plot_seismogram:
             ## iterate over all seismograms
             for filename in files:
                 station_name = os.path.splitext(filename)[0]
-                station_name = station_name.split("/")[-1]
+                network, station, location, channel = station_name.split("/")[-1].split(".")
                 trace = np.loadtxt(filename, delimiter=" ")
                 starttime = trace[0, 0]
                 dt = trace[1, 0] - trace[0, 0]
                 traces.append(
                     obspy.Trace(
                         trace[:, 1],
-                        {"network": station_name, "starttime": starttime, "delta": dt},
+                        {"network": network,
+                         "station": station,
+                         "location": location,
+                         "channel": channel,
+                         "starttime": starttime, "delta": dt},
                     )
                 )
 

src/IO/receivers.cpp

@@ -31,9 +31,14 @@ specfem::IO::read_receivers(const std::string stations_file,
       }
       // check if the read line meets the format
       assert(current_station.size() == 6);
+      /* Get the network and station name
+       * Note that the station name is the second element in the vector
+       * and the network name is the first element. This is standard in
+       * the STATIONS file format.
+       */
+      const std::string station_name = current_station[0];
+      const std::string network_name = current_station[1];
       // get the x and z coordinates of the station;
-      const std::string network_name = current_station[0];
-      const std::string station_name = current_station[1];
       const type_real x = static_cast<type_real>(std::stod(current_station[2]));
       const type_real z = static_cast<type_real>(std::stod(current_station[3]));
 

tests/unit-tests/displacement_tests/Newmark/newmark_tests.cpp

@@ -252,34 +252,34 @@ TEST(DISPLACEMENT_TESTS, newmark_scheme_tests) {
       std::vector<std::string> filename;
       switch (seismogram_type) {
       case specfem::wavefield::type::displacement:
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXX.semd");
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXZ.semd");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXX.semd");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXZ.semd");
         break;
       case specfem::wavefield::type::velocity:
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXX.semv");
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXZ.semv");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXX.semv");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXZ.semv");
         break;
       case specfem::wavefield::type::acceleration:
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXX.sema");
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".BXZ.sema");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXX.sema");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.BXZ.sema");
         break;
       case specfem::wavefield::type::pressure:
-        filename.push_back(Test.database.traces + "/" + station_name + "." +
-                           network_name + ".PRE.semp");
+        filename.push_back(Test.database.traces + "/" + network_name + "." +
+                           station_name + ".S2.PRE.semp");
         break;
       default:
         FAIL() << "--------------------------------------------------\n"
                << "\033[0;31m[FAILED]\033[0m Test failed\n"
                << " - Test name: " << Test.name << "\n"
                << " - Error: Unknown seismogram type\n"
-               << " - Station: " << station_name << "\n"
                << " - Network: " << network_name << "\n"
+               << " - Station: " << station_name << "\n"
                << "--------------------------------------------------\n\n"
                << std::endl;
         break;
@@ -311,8 +311,8 @@ TEST(DISPLACEMENT_TESTS, newmark_scheme_tests) {
                    << "\033[0;31m[FAILED]\033[0m Test failed\n"
                    << " - Test name: " << Test.name << "\n"
                    << " - Error: Times do not match\n"
-                   << " - Station: " << station_name << "\n"
                    << " - Network: " << network_name << "\n"
+                   << " - Station: " << station_name << "\n"
                    << " - Component: " << icomp << "\n"
                    << " - Expected: " << time << "\n"
                    << " - Computed: " << computed_time << "\n"