From 370cfb72b9308f2d8a5ac1e2c14f6628bcdebaeb Mon Sep 17 00:00:00 2001
From: Brown <2mx@ornl.gov>
Date: Tue, 23 Nov 2021 15:14:15 -0500
Subject: [PATCH] clean up and add comments
---
sammy/src/io/Hdf5IO.cpp | 4 ----
sammy/src/io/Hdf5IO.h | 4 ++++
sammy/src/io/OdfIO.cpp | 2 +-
sammy/src/io/convertodf.cpp | 2 --
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sammy/src/io/Hdf5IO.cpp b/sammy/src/io/Hdf5IO.cpp
index a561f5007..b81cc466a 100644
--- a/sammy/src/io/Hdf5IO.cpp
+++ b/sammy/src/io/Hdf5IO.cpp
@@ -59,10 +59,6 @@ namespace sammy {
// --- header -----
fillHDF5header(odfhead);
- for( auto bit : h5head ){
- std::cout << bit.key << " = " << bit.value << std::endl;
- }
-
hsize_t mdim[1];
mdim[0] = h5head.size();
int mrank = sizeof(mdim) / sizeof(hsize_t);
diff --git a/sammy/src/io/Hdf5IO.h b/sammy/src/io/Hdf5IO.h
index 16393d2c8..dd073a0f4 100644
--- a/sammy/src/io/Hdf5IO.h
+++ b/sammy/src/io/Hdf5IO.h
@@ -11,6 +11,10 @@
namespace sammy{
+ /*****************************************************************
+ * This struct defines the keypair values that will be used to
+ * compose the header for HDF5 metadata
+ ****************************************************************/
struct headKeypair{
const char * key;
int value;
diff --git a/sammy/src/io/OdfIO.cpp b/sammy/src/io/OdfIO.cpp
index e25b939fe..11a2241c5 100644
--- a/sammy/src/io/OdfIO.cpp
+++ b/sammy/src/io/OdfIO.cpp
@@ -113,7 +113,7 @@ namespace sammy{
// comments based on OPRODF manual: Jack Craven, report no. ORNL/CSD/TM-45, 1978
// ** keep in mind that changes may have happened between that report and
// ** the writing of the files!!! For example it seems that 36 bit ints are no
- // ** longer used.
+ // ** longer used (32 bit now).
in.read( (char*)&head["mode"], intsize ); // 0,1,3 for 18-bit ints, 36-bit ints, floating-point vals
in.read( (char*)&head["source"], intsize ); // 0,1,2 for SEL, CSISRS, or ENDF/B data
in.read( (char*)&head["irun"], intsize ); // run number
diff --git a/sammy/src/io/convertodf.cpp b/sammy/src/io/convertodf.cpp
index 305f0565e..ea652389e 100644
--- a/sammy/src/io/convertodf.cpp
+++ b/sammy/src/io/convertodf.cpp
@@ -50,7 +50,5 @@ int main(int argc, char const *argv[])
sammy::Hdf5IO h5writer;
h5writer.writeODFtoHDF5(odf.getHeader(),data,hdf5Filename);
-
-
return 0;
}
\ No newline at end of file
--
GitLab