[cig-commits] [commit] master: Remove separate aftershock table from output (6b0607f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Oct 8 17:04:31 PDT 2014
Repository : https://github.com/geodynamics/vc
On branch : master
Link : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04
>---------------------------------------------------------------
commit 6b0607fe536579746a579730bfc7d2d0da471111
Author: Eric Heien <emheien at ucdavis.edu>
Date: Wed Sep 17 10:30:40 2014 -0700
Remove separate aftershock table from output
>---------------------------------------------------------------
6b0607fe536579746a579730bfc7d2d0da471111
src/io/HDF5Data.cpp | 86 -----------------------------------------------------
src/io/HDF5Data.h | 32 +-------------------
2 files changed, 1 insertion(+), 117 deletions(-)
diff --git a/src/io/HDF5Data.cpp b/src/io/HDF5Data.cpp
index 1f382cd..a5d9f4c 100644
--- a/src/io/HDF5Data.cpp
+++ b/src/io/HDF5Data.cpp
@@ -413,23 +413,6 @@ HDF5DataWriter::HDF5DataWriter(const std::string &hdf5_file_name) : HDF5Data() {
if (status < 0) exit(-1);
- // Create the aftershock table
- status = H5TBmake_table("Aftershock Table",
- data_file,
- AFTERSHOCK_TABLE_HDF5,
- AFTERSHOCK_NUM_ENTRIES_HDF5,
- 0,
- sizeof(AftershockInfo),
- aftershock_field_names,
- aftershock_field_offsets,
- aftershock_field_types,
- 1000,
- NULL,
- 0,
- NULL);
-
- if (status < 0) exit(-1);
-
H5Pclose(plist_id);
}
@@ -459,8 +442,6 @@ void HDF5Data::createH5Handles(void) {
event_field_offsets[7] = HOFFSET(EventInfo, final_normal);
event_field_offsets[8] = HOFFSET(EventInfo, start_sweep_rec);
event_field_offsets[9] = HOFFSET(EventInfo, end_sweep_rec);
- event_field_offsets[10] = HOFFSET(EventInfo, start_aftershock_rec);
- event_field_offsets[11] = HOFFSET(EventInfo, end_aftershock_rec);
event_field_types[0] = H5T_NATIVE_UINT;
event_field_types[1] = H5T_NATIVE_DOUBLE;
@@ -529,31 +510,6 @@ void HDF5Data::createH5Handles(void) {
sweep_field_sizes[8] = sizeof(double);
sweep_field_sizes[9] = sizeof(double);
- aftershock_field_names[0] = AFTERSHOCK_EVT_NUM_HDF5;
- aftershock_field_names[1] = AFTERSHOCK_GEN_HDF5;
- aftershock_field_names[2] = AFTERSHOCK_MAG_HDF5;
- aftershock_field_names[3] = AFTERSHOCK_TIME_HDF5;
- aftershock_field_names[4] = AFTERSHOCK_X_HDF5;
- aftershock_field_names[5] = AFTERSHOCK_Y_HDF5;
- aftershock_field_offsets[0] = HOFFSET(AftershockInfo, event_number);
- aftershock_field_offsets[1] = HOFFSET(AftershockInfo, gen);
- aftershock_field_offsets[2] = HOFFSET(AftershockInfo, mag);
- aftershock_field_offsets[3] = HOFFSET(AftershockInfo, time);
- aftershock_field_offsets[4] = HOFFSET(AftershockInfo, x);
- aftershock_field_offsets[5] = HOFFSET(AftershockInfo, y);
- aftershock_field_types[0] = H5T_NATIVE_UINT;
- aftershock_field_types[1] = H5T_NATIVE_UINT;
- aftershock_field_types[2] = H5T_NATIVE_FLOAT;
- aftershock_field_types[3] = H5T_NATIVE_FLOAT;
- aftershock_field_types[4] = H5T_NATIVE_FLOAT;
- aftershock_field_types[5] = H5T_NATIVE_FLOAT;
- aftershock_field_sizes[0] = sizeof(unsigned int);
- aftershock_field_sizes[1] = sizeof(unsigned int);
- aftershock_field_sizes[2] = sizeof(float);
- aftershock_field_sizes[3] = sizeof(float);
- aftershock_field_sizes[4] = sizeof(float);
- aftershock_field_sizes[5] = sizeof(float);
-
// Create dataspace for pairs of values
dimsf[0] = 2;
pair_val_dataspace = H5Screate_simple(1, dimsf, NULL);
@@ -577,12 +533,10 @@ void HDF5DataWriter::setStartEndYears(const double &new_start_year, const double
void HDF5DataWriter::writeEvent(VCEvent &event) {
EventSweeps::iterator it;
VCEventSweep::iterator eit;
- AftershockSet::iterator ait;
VCGeneralEventSet::iterator git;
BlockIDSet involved_blocks;
EventInfo e_info;
EventSweepInfo *s_info_array;
- AftershockInfo *a_info_array;
herr_t status;
unsigned int i, sweep_num, rec_num, event_num;
hsize_t start_fields, end_fields, start_recs, end_recs;
@@ -638,46 +592,6 @@ void HDF5DataWriter::writeEvent(VCEvent &event) {
e_info.start_sweep_rec = start_recs;
e_info.end_sweep_rec = end_recs;
- // Write the aftershocks to the file
- for (ait=event.aftershockBegin(),rec_num=0; ait!=event.aftershockEnd(); ++ait) {
- rec_num++;
- }
-
- // Check the number of records before appending to the table
- status = H5TBget_table_info(data_file, AFTERSHOCK_TABLE_HDF5, &start_fields, &start_recs);
-
- if (status < 0) exit(-1);
-
- if (rec_num > 0) {
- a_info_array = new AftershockInfo[rec_num];
-
- for (ait=event.aftershockBegin(),i=0; ait!=event.aftershockEnd(); ++ait,++i) {
- a_info_array[i].event_number = event_num;
- a_info_array[i].mag = ait->mag;
- a_info_array[i].time = ait->t;
- a_info_array[i].x = ait->x;
- a_info_array[i].y = ait->y;
- a_info_array[i].gen = ait->gen;
- }
-
- H5TBappend_records(data_file,
- AFTERSHOCK_TABLE_HDF5,
- rec_num,
- sizeof(AftershockInfo),
- aftershock_field_offsets,
- aftershock_field_sizes,
- a_info_array);
- delete a_info_array;
- }
-
- // Get the number of records after appending to the table
- status = H5TBget_table_info(data_file, AFTERSHOCK_TABLE_HDF5, &end_fields, &end_recs);
-
- if (status < 0) exit(-1);
-
- e_info.start_aftershock_rec = start_recs;
- e_info.end_aftershock_rec = end_recs;
-
event.getInvolvedBlocks(involved_blocks);
e_info.event_number = event.getEventNumber();
diff --git a/src/io/HDF5Data.h b/src/io/HDF5Data.h
index 0265f3b..ed0f4c6 100644
--- a/src/io/HDF5Data.h
+++ b/src/io/HDF5Data.h
@@ -48,7 +48,7 @@
// Event info related definitions
#define EVENT_TABLE_HDF5 "event_table"
-#define EVENT_NUM_ENTRIES_HDF5 12
+#define EVENT_NUM_ENTRIES_HDF5 10
#define EVENT_NUM_HDF5 "event_number"
#define EVENT_YEAR_HDF5 "event_year"
#define EVENT_TRIGGER_HDF5 "event_trigger"
@@ -59,8 +59,6 @@
#define EVENT_NORMAL_FINAL_HDF5 "event_normal_final"
#define EVENT_START_SWEEP_HDF5 "start_sweep_rec"
#define EVENT_END_SWEEP_HDF5 "end_sweep_rec"
-#define EVENT_START_AS_HDF5 "start_aftershock_rec"
-#define EVENT_END_AS_HDF5 "end_aftershock_rec"
// Event sweeps table definitions
#define SWEEP_TABLE_HDF5 "event_sweep_table"
@@ -76,16 +74,6 @@
#define SWEEP_NORMAL_INIT_HDF5 "normal_init"
#define SWEEP_NORMAL_FINAL_HDF5 "normal_final"
-// Aftershock/background table definitions
-#define AFTERSHOCK_TABLE_HDF5 "aftershock_table"
-#define AFTERSHOCK_NUM_ENTRIES_HDF5 6
-#define AFTERSHOCK_EVT_NUM_HDF5 "event_number"
-#define AFTERSHOCK_GEN_HDF5 "generation"
-#define AFTERSHOCK_MAG_HDF5 "magnitude"
-#define AFTERSHOCK_TIME_HDF5 "time"
-#define AFTERSHOCK_X_HDF5 "x"
-#define AFTERSHOCK_Y_HDF5 "y"
-
// State checkpoint table definitions
#define CHECKPOINT_STATE_HDF5 "checkpoint_state"
#define CHECKPOINT_YEAR_HDF5 "checkpoint_year"
@@ -103,7 +91,6 @@ struct EventInfo {
BlockID event_trigger;
double event_magnitude;
unsigned int start_sweep_rec, end_sweep_rec;
- unsigned int start_aftershock_rec, end_aftershock_rec;
double init_shear, final_shear, init_normal, final_normal;
};
@@ -122,17 +109,6 @@ struct EventSweepInfo {
typedef struct EventSweepInfo EventSweepInfo;
-struct AftershockInfo {
- unsigned int event_number;
- unsigned int gen;
- float mag;
- float time;
- float x;
- float y;
-};
-
-typedef struct AftershockInfo AftershockInfo;
-
#ifdef HDF5_FOUND
// Classes representing a file containing checkpoint data
@@ -225,12 +201,6 @@ class HDF5Data {
hid_t sweep_field_types[SWEEP_NUM_ENTRIES_HDF5];
size_t sweep_field_sizes[SWEEP_NUM_ENTRIES_HDF5];
- // Names, types, offsets and sizes for aftershock/background event table
- const char *aftershock_field_names[AFTERSHOCK_NUM_ENTRIES_HDF5];
- size_t aftershock_field_offsets[AFTERSHOCK_NUM_ENTRIES_HDF5];
- hid_t aftershock_field_types[AFTERSHOCK_NUM_ENTRIES_HDF5];
- size_t aftershock_field_sizes[AFTERSHOCK_NUM_ENTRIES_HDF5];
-
// Values read from shared memory (pointers are set to within shared memory segment)
unsigned int num_blocks;
More information about the CIG-COMMITS
mailing list