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

Dev #32

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Dev #32

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
af3bc99
cdf loading prints
forefire Jul 8, 2024
5c57140
Rob's postprocessing tools update
Jul 8, 2024
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 src/Command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,12 +986,12 @@ int Command::loadData(const string& arg, size_t& numTabs){

#else
simParam->setParameter("NetCDFfile", args[0]);

cout<<" Loading data "<<args[0]<<endl;
try
{
NcFile dataFile(path.c_str(), NcFile::read);
if (!dataFile.isNull()) {
cout<<" NC0 data "<<endl;
NcVar domVar = dataFile.getVar("domain");
if (!domVar.isNull()) {
map<string,NcVarAtt> attributeList = domVar.getAtts();
Expand Down Expand Up @@ -1043,7 +1043,7 @@ int Command::loadData(const string& arg, size_t& numTabs){
simParam->setInt("refDay", yday);
simParam->setInt("refTime", secs);
simParam->setParameter("ISOdate", args[1]);

cout<<"loading at time "<<args[1]<<" " <<"yday"<<endl;
}

string com = "FireDomain[sw=("+simParam->getParameter("SWx")+".,"+simParam->getParameter("SWy")+".,"+simParam->getParameter("SWz")+".);ne=(";
Expand Down
1 change: 0 additions & 1 deletion src/DataBroker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ void DataBroker::readTableFromAsciiFile(string filename,
vals.clear();
}
file.close();

}

void DataBroker::tokenize(const string& str, vector<string>& tokens,
Expand Down
Binary file removed tools/3nestFFCASE/006_runff/ForeFire/fuels.png
View file
Open in desktop
Binary file not shown.
Loading
Loading