Skip to content

Weather fix from Cris #89

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
DLWoodruff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Weather fix from Cris #89

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
25 changes: 23 additions & 2 deletions cell2fire/Cell2FireC/Cell2Fire.cpp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ Cell2Fire::Cell2Fire(arguments _args) : CSVWeather(_args.InFolder + "Weather.csv
// Populate WDF
int WPeriods = WeatherDF.size() - 1; // -1 due to header
wdf_ptr = &wdf[0];
std::cout << "Weather Periods: " << WPeriods << std::endl;

// Populate the wdf objects
this->CSVWeather.parseWeatherDF(wdf_ptr, this->WeatherDF, WPeriods);
Expand Down Expand Up @@ -490,14 +491,34 @@ void Cell2Fire::reset(int rnumber, double rnumber2){
std::abort();
}

std::cout << "Weather file selected: " << this->CSVWeather.fileName << std::endl;
std::cout << "\nWeather file selected: " << this->CSVWeather.fileName << std::endl;

// Populate WDF
int WPeriods = this->WeatherDF.size() - 1; // -1 due to header
wdf_ptr = &wdf[0];
std::cout << "Weather Periods: " << WPeriods << std::endl;

// Populate the wdf objects
this->CSVWeather.parseWeatherDF(wdf_ptr, this->WeatherDF, WPeriods);
//DEBUGthis->CSVWeather.printData(this->WeatherDF);

// Check maxFirePeriods and Weather File consistency (reset MaxFirePeriods and recalculate)
int maxFP = this->args.MinutesPerWP / this->args.FirePeriodLen * WPeriods;
this->args.MaxFirePeriods = 10000000;
//DEBUGstd::cout << "Int MaxFP: " << maxFP << std::endl;
//DEBUGstd::cout << "MinutesPerWP: " << this->args.MinutesPerWP << std::endl;
//DEBUGstd::cout << "FirePeriodLen: " << this->args.FirePeriodLen << std::endl;
//DEBUGstd::cout << "MaxfirePeriods: " << this->args.MaxFirePeriods << std::endl;

if (this->args.MaxFirePeriods > maxFP) {
this->args.MaxFirePeriods = maxFP ;
if (this->args.verbose){
std::cout << "Maximum fire periods are set to: " << this->args.MaxFirePeriods << " based on the weather file, Fire Period Length, and Minutes per WP" << std::endl;
}
}



}

// Random ROS-CV
Expand Down Expand Up @@ -1425,7 +1446,7 @@ int main(int argc, char * argv[]){
rnumber2 = ndistribution(generator);

// Reset
Forest.reset(rnumber, rnumber2);
Forest.reset(rnumber, rnumber2);

// Time steps during horizon (or until we break it)
for (tstep = 0; tstep <= Forest.args.MaxFirePeriods * Forest.args.TotalYears ; tstep++){
Expand Down