Skip to content
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

Rename 'struct bmi' to not conflict with declarations from BMI headers #38

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Rename 'struct bmi' to not conflict with declarations from BMI headers #38

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
6 changes: 3 additions & 3 deletions include/pet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ struct intermediate_vars
//double water_latent_heat_of_vaporization_J_per_kg;
double psychrometric_constant_Pa_per_C; // gamma
};
struct bmi
struct pet_bmi
{
/*
JMFRAME: Fred suggested changing time step size to make the units of seconds explicit...
Expand Down Expand Up @@ -265,7 +265,7 @@ struct pet_model{
struct solar_radiation_parameters solar_params;
struct solar_radiation_results solar_results;

struct bmi bmi;
struct pet_bmi bmi;

};
typedef struct pet_model pet_model;
Expand Down Expand Up @@ -294,4 +294,4 @@ extern double greg_2_jul_pet(long year, long mon, long day, long h, long mi,
double se);
extern void calc_date_pet(double jd, long *y, long *m, long *d, long *h, long *mi,
double *sec);
#endif
#endif
Loading