Skip to content

added nwm_ponded_depth #8

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

Open
mkarim-rtx wants to merge 2 commits into
base: development
Choose a base branch
from
+30 −7
Open

added nwm_ponded_depth #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b16428f
added nwm_ponded_depth
mkarim-rtx Mar 26, 2026
c11606c
fixed typo
mkarim-rtx Mar 26, 2026
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
3 changes: 2 additions & 1 deletion include/topmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ extern void topmod(FILE *output_fptr, int nstep, int num_topodex_values,
const double *time_delay_histogram,
double *sbar,int num_delay, int current_time_step, int stand_alone,
double *sump, double *sumae, double *sumq, double *sumrz, double *sumuz,
double *quz, double *qb, double *qof, double *p, double *ep);
double *quz, double *qb, double *qof, double *p, double *ep, double *ponded_depth);

extern int tread(FILE *subcat_fptr,FILE *output_fptr,char *subcat,
int *num_topodex_values,int *num_channels,double *area,
Expand Down Expand Up @@ -184,6 +184,7 @@ struct TopModel_Struct{
double qof; /* flow from saturated area and infiltration excess flow*/
double p; /* adjusted rain*/
double ep; /* adjusted potential evaporation*/
double ponded_depth; /* queued delayed flow from hydrograph ordinates */

/************** Framework vars **************/
int stand_alone;
Expand Down
1 change: 1 addition & 0 deletions src/bmi_serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ void TopmodelSerializer::serialize(Archive& ar, const unsigned int version) {
ar & model->qof; //
ar & model->p; // reassigned each update; used in calc after assignment
ar & model->ep; // reassigned each update; used in calc after assignment
ar & model->ponded_depth; // reassigned each update
ar & model->sbar; // used then reassigned

// array data that updates in update; counts set in config
Expand Down
23 changes: 18 additions & 5 deletions src/bmi_topmodel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* BMI Adaption: Max i/o file name length changed from 30 to 256 */
#define MAX_FILENAME_LENGTH 256
#define OUTPUT_VAR_NAME_COUNT 14
#define OUTPUT_VAR_NAME_COUNT 15
#define INPUT_VAR_NAME_COUNT 2
#define PARAM_VAR_NAME_COUNT 8

Expand All @@ -27,7 +27,8 @@ static const char *output_var_names[OUTPUT_VAR_NAME_COUNT] = {
"land_surface_water__domain_time_integral_of_runoff_volume_flux", // sumq
"soil_water__domain_root-zone_volume_deficit", // sumrz
"soil_water__domain_unsaturated-zone_volume", // sumuz
"land_surface_water__water_balance_volume" // bal
"land_surface_water__water_balance_volume", // bal
"nwm_ponded_depth" // sum of Q[1..num_time_delay_histo_ords]
};

static const char *output_var_types[OUTPUT_VAR_NAME_COUNT] = {
Expand All @@ -44,11 +45,12 @@ static const char *output_var_types[OUTPUT_VAR_NAME_COUNT] = {
"double",
"double",
"double",
"double",
"double"
};

static const int output_var_item_count[OUTPUT_VAR_NAME_COUNT] =
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};

static const char *output_var_units[OUTPUT_VAR_NAME_COUNT] = {
"m h-1",
Expand All @@ -64,11 +66,12 @@ static const char *output_var_units[OUTPUT_VAR_NAME_COUNT] = {
"m",
"m",
"m",
"m",
"m"
};

static const int output_var_grids[OUTPUT_VAR_NAME_COUNT] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

static const char *output_var_locations[OUTPUT_VAR_NAME_COUNT] = {
"node",
Expand All @@ -84,6 +87,7 @@ static const char *output_var_locations[OUTPUT_VAR_NAME_COUNT] = {
"node",
"node",
"node",
"node",
"node"
};

Expand Down Expand Up @@ -501,7 +505,8 @@ static int Update(Bmi *self) {
&topmodel->qb,
&topmodel->qof,
&topmodel->p,
&topmodel->ep
&topmodel->ep,
&topmodel->ponded_depth
);

return BMI_SUCCESS;
Expand Down Expand Up @@ -911,6 +916,14 @@ static int Get_value_ptr(Bmi *self, const char *name, void **dest) {
*dest = (void *)&topmodel->bal;
return BMI_SUCCESS;
}

// ponded depth
if (strcmp(name, "nwm_ponded_depth") == 0) {
topmodel_model *topmodel;
topmodel = (topmodel_model *)self->data;
*dest = (void *)&topmodel->ponded_depth;
return BMI_SUCCESS;
}
// szm (parameter)
if (strcmp(name, "szm") == 0) {
topmodel_model *topmodel;
Expand Down
10 changes: 9 additions & 1 deletion src/topmodel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ extern void topmod(
double *qb,
double *qof,
double *p,
double *ep
double *ep,
double *ponded_depth
) {
/*****************************************************************

Expand Down Expand Up @@ -357,6 +358,13 @@ extern void topmod(
Q[in] += (*Qout) * time_delay_histogram[ir];
}

/* Ponded depth: sum delayed-flow components currently stored in the
* hydrograph ordinates portion of the routing array. */
*ponded_depth = 0.0;
for (ir = 1; ir <= num_time_delay_histo_ords; ir++) {
*ponded_depth += Q[ir];
}

// Add current time flow to mass balance variable
*sumq += Q[it];
/* BMI Adaption: replace nstep with current_time_step */
Expand Down