Skip to content

bug_fix_AET #142

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

Closed
ajkhattak wants to merge 1 commit into from
Closed

bug_fix_AET #142

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
5 changes: 5 additions & 0 deletions include/cfe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct evapotranspiration_structure {
double potential_et_m_per_timestep;
double reduced_potential_et_m_per_timestep;
double actual_et_from_rain_m_per_timestep;
double actual_et_from_retention_depth_m_per_timestep;
double actual_et_from_soil_m_per_timestep;
double actual_et_m_per_timestep;
};
Expand Down Expand Up @@ -122,6 +123,7 @@ struct massbal
double volin ;
double volout ;
double volend ;
double vol_et_from_retention_depth;
};
typedef struct massbal massbal;

Expand Down Expand Up @@ -158,6 +160,9 @@ extern void Xinanjiang_partitioning_scheme(double water_input_depth_m, double fi

extern void et_from_rainfall(double *timestep_rainfall_input_m, struct evapotranspiration_structure *et_struct);

extern void et_from_retention_depth(struct nash_cascade_parameters *nash_surface_params,
struct evapotranspiration_structure *et_struct);

extern void et_from_soil(struct conceptual_reservoir *soil_res, struct evapotranspiration_structure *et_struct,
struct NWM_soil_parameters *soil_parms);

Expand Down
12 changes: 7 additions & 5 deletions src/bmi_cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3227,6 +3227,7 @@ extern void initialize_volume_trackers(cfe_state_struct* cfe_ptr) {
cfe_ptr->vol_struct.vol_soil_start = cfe_ptr->soil_reservoir.storage_m;
cfe_ptr->vol_struct.vol_et_from_soil = 0;
cfe_ptr->vol_struct.vol_et_from_rain = 0;
cfe_ptr->vol_struct.vol_et_from_retention_depth = 0;
cfe_ptr->vol_struct.vol_et_to_atm = 0;
}

Expand Down Expand Up @@ -3325,11 +3326,12 @@ extern void mass_balance_check(cfe_state_struct* cfe_ptr){
giuh_residual = cfe_ptr->vol_struct.vol_runoff - cfe_ptr->vol_struct.vol_out_surface - cfe_ptr->vol_struct.vol_end_surface -
cfe_ptr->vol_struct.vol_runon_infilt;
Copy link
Contributor

@fred-ogden fred-ogden Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: is vol_struct>vol_et_from_retention_depth included in cfe_ptr->vol_struct.vol_end_surfaced? Secong question, should this mass balance equation on line 3325 be: giuh_residual = cfe_ptr->vol_struct.vol_runoff - cfe_ptr->vol_struct.vol_out_surface - cfe_ptr->vol_struct.vol_end_surface - cfe_ptr->vol_struct.vol_runon_infilt - cfe_ptr->vol-struct.vol_et_from_retention_depth; ?

printf("********************* SURFACE MASS BALANCE *********************\n");
printf(" Volume into surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_runoff);
printf(" Volume out surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_out_surface);
printf(" Volume end surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_end_surface);
printf(" Runon infiltration = %8.4lf m\n",cfe_ptr->vol_struct.vol_runon_infilt);
printf(" Surface residual = %6.4e m\n",giuh_residual); // should equal zero
printf(" Volume into surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_runoff);
printf(" Volume out surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_out_surface);
printf(" Volume end surface = %8.4lf m\n",cfe_ptr->vol_struct.vol_end_surface);
printf(" Runon infiltration = %8.4lf m\n",cfe_ptr->vol_struct.vol_runon_infilt);
printf(" Vol_et_from_retention_depth = %8.4lf m\n",cfe_ptr->vol_struct.vol_et_from_retention_depth);
printf(" Surface residual = %6.4e m\n", giuh_residual); // should equal zero
if(!is_fabs_less_than_epsilon(giuh_residual,1.0e-12))
printf("WARNING: GIUH MASS BALANCE CHECK FAILED\n");

Expand Down
56 changes: 47 additions & 9 deletions src/cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,40 @@ extern void cfe(
evap_struct->reduced_potential_et_m_per_timestep = evap_struct->potential_et_m_per_s * time_step_size;

evap_struct->actual_et_from_rain_m_per_timestep = 0;
if(timestep_rainfall_input_m > 0) {et_from_rainfall(&timestep_rainfall_input_m,evap_struct);}
if (timestep_rainfall_input_m > 0) {
et_from_rainfall(&timestep_rainfall_input_m,evap_struct);
}

massbal_struct->vol_et_from_rain = massbal_struct->vol_et_from_rain + evap_struct->actual_et_from_rain_m_per_timestep;
massbal_struct->vol_et_to_atm = massbal_struct->vol_et_to_atm + evap_struct->actual_et_from_rain_m_per_timestep;
massbal_struct->volout=massbal_struct->volout+evap_struct->actual_et_from_rain_m_per_timestep;
massbal_struct->vol_et_to_atm = massbal_struct->vol_et_to_atm + evap_struct->actual_et_from_rain_m_per_timestep;
massbal_struct->volout = massbal_struct->volout + evap_struct->actual_et_from_rain_m_per_timestep;

// AET from surface retention depth
evap_struct->actual_et_from_retention_depth_m_per_timestep = 0;
if (nash_surface_params->nash_storage[0] > 0.0 && evap_struct->reduced_potential_et_m_per_timestep > 0.0) {
et_from_retention_depth(nash_surface_params, evap_struct);
}

// LKC: Change this. Now evaporation happens before runoff calculation. This was creating issues since it modifies storage_m and not storage_deficit
massbal_struct->vol_et_from_retention_depth += evap_struct->actual_et_from_retention_depth_m_per_timestep;
massbal_struct->vol_et_to_atm += evap_struct->actual_et_from_retention_depth_m_per_timestep;
massbal_struct->volout += evap_struct->actual_et_from_retention_depth_m_per_timestep;
massbal_struct->vol_out_surface += evap_struct->actual_et_from_retention_depth_m_per_timestep;

// LKC: Change this. Now evaporation happens before runoff calculation. This was creating issues since it modifies
// storage_m and not storage_deficit
evap_struct->actual_et_from_soil_m_per_timestep = 0;
if(soil_reservoir_struct->storage_m > NWM_soil_params_struct.wilting_point_m)
{et_from_soil(soil_reservoir_struct, evap_struct, &NWM_soil_params_struct);}
if(soil_reservoir_struct->storage_m > NWM_soil_params_struct.wilting_point_m) {
et_from_soil(soil_reservoir_struct, evap_struct, &NWM_soil_params_struct);
}

massbal_struct->vol_et_from_soil = massbal_struct->vol_et_from_soil + evap_struct->actual_et_from_soil_m_per_timestep;
massbal_struct->vol_et_to_atm = massbal_struct->vol_et_to_atm + evap_struct->actual_et_from_soil_m_per_timestep;
massbal_struct->volout=massbal_struct->volout+evap_struct->actual_et_from_soil_m_per_timestep;
massbal_struct->vol_et_to_atm = massbal_struct->vol_et_to_atm + evap_struct->actual_et_from_soil_m_per_timestep;
massbal_struct->volout = massbal_struct->volout + evap_struct->actual_et_from_soil_m_per_timestep;

evap_struct->actual_et_m_per_timestep = evap_struct->actual_et_from_rain_m_per_timestep +
evap_struct->actual_et_from_retention_depth_m_per_timestep +
evap_struct->actual_et_from_soil_m_per_timestep;

evap_struct->actual_et_m_per_timestep=evap_struct->actual_et_from_rain_m_per_timestep+evap_struct->actual_et_from_soil_m_per_timestep;
// LKC: This needs to be calcualted here after et_from_soil since soil_reservoir_struct->storage_m changes
soil_reservoir_storage_deficit_m=(NWM_soil_params_struct.smcmax*NWM_soil_params_struct.D-soil_reservoir_struct->storage_m);

Expand Down Expand Up @@ -545,6 +564,25 @@ void et_from_rainfall(double *timestep_rainfall_input_m, struct evapotranspirati
}
}

//##############################################################
//########### ET FROM SURFACE RETENTION DEPTH ##############
//##############################################################
void et_from_retention_depth(struct nash_cascade_parameters *nash_surface_params, struct evapotranspiration_structure *et_struct)
{
if (et_struct->reduced_potential_et_m_per_timestep >= nash_surface_params->nash_storage[0]) {
et_struct->actual_et_from_retention_depth_m_per_timestep = nash_surface_params->nash_storage[0];
nash_surface_params->nash_storage[0] = 0.0;
}
else {
et_struct->actual_et_from_retention_depth_m_per_timestep = et_struct->reduced_potential_et_m_per_timestep;
//et_struct->reduced_potential_et_m_per_timestep = 0.0;
nash_surface_params->nash_storage[0] -= et_struct->actual_et_from_retention_depth_m_per_timestep;
}

et_struct->reduced_potential_et_m_per_timestep -= et_struct->actual_et_from_retention_depth_m_per_timestep;

}

//##############################################################
//#################### ET FROM SOIL ########################
//##############################################################
Expand Down
Loading