Skip to content

added original date #1570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guillaumevernieres merged 1 commit into from
Mar 25, 2025
Merged

added original date #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions utils/obsproc/NetCDFToIodaConverter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ namespace gdasapp {
count++;
}

if (iodaVars.originalDatetime_.size() != 0) {
ioda::Variable iodaOriginalDatetime =
ogrp.vars.createWithScales<int64_t>("MetaData/originalDateTime",
{ogrp.vars["Location"]}, long_params);
iodaOriginalDatetime.writeWithEigenRegular(iodaVars.originalDatetime_);
}

// Test output
iodaVars.testOutput();

Expand Down
17 changes: 17 additions & 0 deletions utils/obsproc/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ namespace gdasapp {
std::vector<std::string> floatMetadataName_; // String descriptor of the float metadata
Eigen::ArrayXXi intMetadata_; // Optional array of integer metadata
std::vector<std::string> intMetadataName_; // String descriptor of the integer metadata
Eigen::Array<int64_t, Eigen::Dynamic, 1> originalDatetime_;

// Optional global attributes
std::map<std::string, std::string> strGlobalAttr_;
Expand All @@ -133,6 +134,7 @@ namespace gdasapp {
floatMetadataName_(fmnames),
intMetadata_(location_, imnames.size()),
intMetadataName_(imnames),
originalDatetime_(), // initialized as empty
channel_(1),
channelValues_(Eigen::ArrayXi::Constant(channel_, -1))
{
Expand All @@ -157,6 +159,9 @@ namespace gdasapp {
preQc_.conservativeResize(location_ * channel_ + other.location_ * other.channel_);
floatMetadata_.conservativeResize(location_ + other.location_, nfMetadata_);
intMetadata_.conservativeResize(location_ + other.location_, niMetadata_);
if (originalDatetime_.size() != 0) {
originalDatetime_.conservativeResize(location_ + other.location_);
}

// Copy data from the 'other' object to this object
longitude_.tail(other.location_) = other.longitude_;
Expand All @@ -167,6 +172,9 @@ namespace gdasapp {
preQc_.tail(other.location_) = other.preQc_;
floatMetadata_.bottomRows(other.location_) = other.floatMetadata_;
intMetadata_.bottomRows(other.location_) = other.intMetadata_;
if (originalDatetime_.size() != 0) {
originalDatetime_.tail(other.location_) = other.originalDatetime_;
}

// Update obs count
location_ += other.location_;
Expand Down Expand Up @@ -194,6 +202,9 @@ namespace gdasapp {
for (int k = 0; k < niMetadata_; k++) {
iodaVarsMasked.intMetadata_(j, k) = intMetadata_(i, k);
}
if (originalDatetime_.size() != 0) {
iodaVarsMasked.originalDatetime_(j) = originalDatetime_(i);
}
j++;
} // end if (mask(i))
}
Expand All @@ -206,6 +217,7 @@ namespace gdasapp {
preQc_ = iodaVarsMasked.preQc_;
floatMetadata_ = iodaVarsMasked.floatMetadata_;
intMetadata_ = iodaVarsMasked.intMetadata_;
originalDatetime_ = iodaVarsMasked.originalDatetime_;

// Update obs count
location_ = iodaVarsMasked.location_;
Expand All @@ -221,11 +233,16 @@ namespace gdasapp {
oops::Log::test() << checksum(longitude_, "longitude") << std::endl;
oops::Log::test() << checksum(latitude_, "latitude") << std::endl;
oops::Log::test() << checksum(datetime_, "datetime") << std::endl;
if (originalDatetime_.size() != 0) {
oops::Log::test() << checksum(originalDatetime_, "originalDatetime") << std::endl;
}
}

// Changing the date and Adjusting Errors
void reDate(const util::DateTime & windowBegin, const util::DateTime & windowEnd,
const std::string &epochDate, float errRatio) {
// save the original
originalDatetime_ = datetime_;
// windowBegin and End into DAwindowTimes
std::vector<util::DateTime> DAwindowTimes = {windowBegin, windowEnd};
// Epoch DateTime from Provider
Expand Down
4 changes: 4 additions & 0 deletions utils/test/testref/insituall2ioda.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ datetime:
Min: 1616619601
Max: 1616641199
Sum: 51732172800
originalDatetime:
Min: 1616598720
Max: 1616645340
Sum: 51731904960
4 changes: 4 additions & 0 deletions utils/test/testref/rads2ioda.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ datetime:
Min: 5131805184
Max: 5131807744
Sum: 112899742208
originalDatetime:
Min: 5131805184
Max: 5131807744
Sum: 112899742208