Skip to content

Merge Changes on OWP Mater Branch with Development (NGWPC-9801) #17

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
idtodd merged 1 commit into from
Feb 18, 2026
Merged

Merge Changes on OWP Mater Branch with Development (NGWPC-9801) #17

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
18 changes: 16 additions & 2 deletions src/bmi_cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,6 +1176,8 @@ int read_init_config_cfe(const char* config_file, cfe_state_struct* model)
else {
model->soil_reservoir.is_aet_rootzone = FALSE;
model->soil_reservoir.n_soil_layers = 1;
model->soil_reservoir.soil_layer_depths_m = NULL;
model->soil_reservoir.delta_soil_layer_depth_m = NULL;
}

/*--------------------END OF ROOT ZONE ADJUSTED AET DEVELOPMENT -rlm ------------------------------*/
Expand Down Expand Up @@ -1367,6 +1369,11 @@ static int Initialize (Bmi *self, const char *file)
cfe_bmi_data_ptr->gw_reservoir.coeff_secondary = 0.0; // 0.0 means that secondary outlet is not applied
cfe_bmi_data_ptr->gw_reservoir.exponent_secondary = 1.0; // linear

// Not used in gw reservoir
cfe_bmi_data_ptr->gw_reservoir.smc_profile = NULL;
cfe_bmi_data_ptr->gw_reservoir.soil_layer_depths_m = NULL;
cfe_bmi_data_ptr->gw_reservoir.delta_soil_layer_depth_m = NULL;

// Initialize soil conceptual reservoirs
//LKC Remove alpha_fc
init_soil_reservoir(cfe_bmi_data_ptr);
Expand Down Expand Up @@ -1512,7 +1519,10 @@ static int Finalize (Bmi *self)
free(model->forcing_data_precip_kg_per_m2);
if( model->forcing_data_time != NULL )
free(model->forcing_data_time);

if( model->forcing_file != NULL ){
free(model->forcing_file);
}

if( model->giuh_ordinates != NULL )
free(model->giuh_ordinates);
if( model->nash_storage_subsurface != NULL )
Expand All @@ -1521,7 +1531,10 @@ static int Finalize (Bmi *self)
free(model->runoff_queue_m_per_timestep);
if( model->flux_Qout_m != NULL )
free(model->flux_Qout_m);


if( model->soil_reservoir.smc_profile != NULL )
free(model->soil_reservoir.smc_profile);

/* xinanjiang_dev: changing name to the more general "direct runoff"
if( model->flux_Schaake_output_runoff_m != NULL )
free(model->flux_Schaake_output_runoff_m);*/
Expand Down Expand Up @@ -3187,6 +3200,7 @@ extern void init_soil_reservoir(cfe_state_struct* cfe_ptr)
}*/

extern void initialize_volume_trackers(cfe_state_struct* cfe_ptr) {
cfe_ptr->vol_struct.volstart = 0.0;
cfe_ptr->vol_struct.volin = 0;
cfe_ptr->vol_struct.vol_runoff = 0;
cfe_ptr->vol_struct.vol_infilt = 0;
Expand Down
Loading