Skip to content

Fix issue where multiple mesh data sets could not be written to a single netcdf data file #1135

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
drroe merged 4 commits into from
Mar 18, 2025
Merged

Fix issue where multiple mesh data sets could not be written to a single netcdf data file #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a132985
Have netcdf errors written to stderr
Mar 17, 2025
ba116e8
Fix error message
Mar 18, 2025
83ae808
Fix bug where multiple mesh data sets could not be written to a singl…
drroe Mar 18, 2025
bcb7a70
6.29.12. Revision bump for fixing bug where multiple mesh data sets c…
drroe Mar 18, 2025
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
19 changes: 11 additions & 8 deletions src/DataIO_NetCDF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,8 +1428,8 @@ int DataIO_NetCDF::writeData_vector_scalar(DataSet const* ds) {
}

/** Write 1D DataSets that share an index dimension. */
int DataIO_NetCDF::writeData_1D(DataSet const* ds, Dimension const& dim, SetArray const& sets) {
if (ds->Type() == DataSet::PH)
int DataIO_NetCDF::writeData_1D(DataSet const* firstSet, Dimension const& dim, SetArray const& sets) {
if (firstSet->Type() == DataSet::PH)
mprintf("Warning: Currently only State information saved for pH sets.\n");
if (debug_ > 0) {
mprintf("DEBUG: Sets for dimension '%s' %f %f:", dim.label(), dim.Min(), dim.Step());
Expand All @@ -1439,7 +1439,7 @@ int DataIO_NetCDF::writeData_1D(DataSet const* ds, Dimension const& dim, SetArra
}
// Define the dimension. Ensure name is unique by appending an index.
if (EnterDefineMode(ncid_)) return 1;
int dimIdx = defineDim( "length", ds->Size(), ds->Meta().Legend() );
int dimIdx = defineDim( "length", firstSet->Size(), firstSet->Meta().Legend() );
if (dimIdx < 0) return 1;
NcDim lengthDim = Dimensions_[dimIdx];

Expand All @@ -1466,6 +1466,8 @@ int DataIO_NetCDF::writeData_1D(DataSet const* ds, Dimension const& dim, SetArra
return 1;
}
// Add variable(s)
if (debug_ > 0)
mprintf("DEBUG: Defining variable '%s' for set '%s'\n", it->DS()->Meta().PrintName().c_str(), it->DS()->legend());
variables.push_back( VarArray() );
VarArray& set_vars = variables.back();
if (it->DS()->Type() == DataSet::STRING) {
Expand Down Expand Up @@ -1529,22 +1531,23 @@ int DataIO_NetCDF::writeData_1D(DataSet const* ds, Dimension const& dim, SetArra
set_vars.push_back( mat3x3Var );
} else if (it->DS()->Type() == DataSet::XYMESH) {
// ----- XY mesh set -------------
DataSet_Mesh const& meshSet = static_cast<DataSet_Mesh const&>( *(it->DS()) );
// Define the Y variable
NcVar yVar = defineVar(Dimensions_[dimIdx].DID(), NC_DOUBLE, ds->Meta().PrintName(), "Y");
NcVar yVar = defineVar(Dimensions_[dimIdx].DID(), NC_DOUBLE, meshSet.Meta().PrintName(), "Y");
if (yVar.Empty()) {
mprinterr("Error: Could not define Y variable for set '%s'\n", ds->legend());
mprinterr("Error: Could not define Y variable for set '%s'\n", meshSet.legend());
return 1;
}
set_vars.push_back( yVar );
// Define the X variable.
NcVar xVar = defineVar(Dimensions_[dimIdx].DID(), NC_DOUBLE, ds->Meta().PrintName(), "X");
NcVar xVar = defineVar(Dimensions_[dimIdx].DID(), NC_DOUBLE, meshSet.Meta().PrintName(), "X");
if (xVar.Empty()) {
mprinterr("Error: Could not define Y variable for '%s'\n", ds->legend());
mprinterr("Error: Could not define X variable for '%s'\n", meshSet.legend());
return 1;
}
set_vars.push_back( xVar );
// Add DataSet info to variable
if (AddDataSetInfo(ds, std::vector<int>(1, xVar.VID()), ncid_, yVar.VID())) return 1;
if (AddDataSetInfo(it->DS(), std::vector<int>(1, xVar.VID()), ncid_, yVar.VID())) return 1;
} else {
// ----- All other 1D sets -------
set_vars.push_back( defineVar(lengthDim.DID(), dtype, it->DS()->Meta().PrintName(), "Y") );
Expand Down
2 changes: 1 addition & 1 deletion src/NC_Routines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ NC::FormatType NC::GetFormatType(std::string const& fnameIn) {
// NC::CheckErr()
bool NC::CheckErr(int ncerr) {
if ( ncerr != NC_NOERR ) {
mprintf("%s\n", nc_strerror(ncerr));
mprinterr("Error: %s\n", nc_strerror(ncerr));
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Whenever a number that precedes <revision> is incremented, all subsequent
* numbers should be reset to 0.
*/
#define CPPTRAJ_INTERNAL_VERSION "V6.29.11"
#define CPPTRAJ_INTERNAL_VERSION "V6.29.12"
/// PYTRAJ relies on this
#define CPPTRAJ_VERSION_STRING CPPTRAJ_INTERNAL_VERSION
#endif
Loading