Skip to content

Initial and Final State Files #38

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
jhs507 merged 2 commits into from
May 11, 2021
Merged

Initial and Final State Files #38

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
55018a2
Inital and Final State File Functionality
jhs507 May 10, 2021
b13e725
Changed line reads during ReadStateFile to be line lenght agnostic.
jhs507 May 10, 2021
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
125 changes: 105 additions & 20 deletions crhmcode/src/core/CRHMmain/CRHMmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,10 +828,15 @@ void CRHMmain::DoPrjOpen(string OpenNamePrj, string PD) {
}
else if (S == "Final_State") {
getline(DataFile, S);
if (S[0] != '#') {
if (S[1] != '#') {
SS = S.c_str();
SaveStateFileName = SS;
SaveStateFlag = true;
DataFile >> S;
}
}
else
SaveStateFileName = "";
}
else if (S == "Log_Last") {
ReportAll = false;
}
Expand Down Expand Up @@ -2128,11 +2133,22 @@ void CRHMmain::RunClick2End(MMSData * mmsdata)
((ClassModule*)(Global::OurModulesList->Objects[ii]))->finish(true);

if (GoodRun) {
// LogDebugT("\"end of run\".");

/*Either print the whole report or just the last time step.*/
if (ReportAll)
{
AllRprt();
}
else
{
LastRprt();
}

if (SaveStateFlag)
{
SaveState();
}

}

//double timediff2 = double(clock() - begintime2) / CLOCKS_PER_SEC; /////////////////////////////////////////////////////
Expand Down Expand Up @@ -2285,28 +2301,28 @@ void CRHMmain::ReadStateFile(bool & GoodRun)
ClassVar *thisVar;

// ifstream DataFile;
char module[24], name[24], Descrip[80], Line[80];
std::string module, name, Descrip, Line;
string S;
ifstream DataFile(OpenNameState.c_str());
if (!DataFile) {
Common::Message("cannot open file", "File Error");
return;
}

DataFile.getline(Descrip, 80);
DataFile.ignore(80, '#');
DataFile.getline(Line, 80);
getline(DataFile, Descrip);
DataFile.ignore((numeric_limits<streamsize>::max)(), '#');
getline(DataFile, Line);

DataFile.getline(Line, 80); // read "TIME:"
getline(DataFile, Line); // read "TIME:"
int D[3]{};
DataFile >> D[0] >> D[1] >> D[2];
double DT = StandardConverterUtility::EncodeDateTime(D[0], D[1], D[2], 0, 0); // ????

DataFile.getline(Descrip, 80);
DataFile.ignore(80, '#');
DataFile.getline(Line, 80);
getline(DataFile, Descrip);
DataFile.ignore((numeric_limits<streamsize>::max)(), '#');
getline(DataFile, Line);

DataFile.getline(Line, 80); // read "Dimension:"
getline(DataFile, Line); // read "Dimension:"
long filehru, filelay;
DataFile >> filehru >> filelay;
if (filehru != Global::nhru || filelay != Global::nlay) {
Expand All @@ -2315,8 +2331,8 @@ void CRHMmain::ReadStateFile(bool & GoodRun)
return;
}

DataFile.ignore(80, '#');
DataFile.getline(Line, 80);
DataFile.ignore((numeric_limits<streamsize>::max)(), '#');
getline(DataFile, Line);

while (!DataFile.eof()) {
DataFile >> module >> name;
Expand Down Expand Up @@ -2344,13 +2360,13 @@ void CRHMmain::ReadStateFile(bool & GoodRun)
else if (thisVar->ivalues != NULL)
DataFile >> thisVar->ilayvalues[ll][ii];
}
DataFile.ignore(80, '#');
DataFile.getline(Line, 80);
DataFile.ignore((numeric_limits<streamsize>::max)(), '#');
getline(DataFile, Line);
}
else {
Common::Message((string("State File variable ") + S.c_str()).c_str(), "Unknown variable");
DataFile.ignore(80, '#');
DataFile.getline(Line, 80);
DataFile.ignore((numeric_limits<streamsize>::max)(), '#');
getline(DataFile, Line);
}
}
}
Expand Down Expand Up @@ -3189,8 +3205,7 @@ void CRHMmain::SaveProject(string prj_description, string filepath) {
ProjectList->Add("Final_State");
ProjectList->Add("######");
if (SaveStateFlag) {
//need to modify
//ProjectList->Add(SaveDialogState->FileName);
ProjectList->Add(SaveStateFileName);
}
ProjectList->Add("######");
}
Expand Down Expand Up @@ -3802,3 +3817,73 @@ string CRHMmain::BuildLay(string S, long Lay) {

return S.substr(1, S.length() - 1) + "," + to_string(Lay) + ")";
}

void CRHMmain::SaveState()
{
TStringList* StateList;
MapVar::iterator itVar;
ClassVar* thisVar;
StateList = new TStringList;
std::string S;

StateList->Add("Description of State File - to be added");
StateList->Add("######");

StateList->Add("Time:");
S = FormatString(Global::DTnow, "YMD");
StateList->Add(S);
StateList->Add("######");

StateList->Add("Dimension:");
StateList->Add(std::to_string(Global::nhru) + " " + std::to_string(Global::nlay));
StateList->Add("######");

for (itVar = Global::MapVars.begin(); itVar != Global::MapVars.end(); itVar++) {
thisVar = (*itVar).second;
if (thisVar->varType < TVar::Read && thisVar->StatVar) {
S = std::string(thisVar->module.c_str()) + " " +
std::string(thisVar->name.c_str());
StateList->Add(S);
S = "";
if (thisVar->lay == 0)
for (int ii = 0; ii < thisVar->dim; ii++) {
if (thisVar->values != NULL)
S = S + FloatToStrF(thisVar->values[ii], TFloatFormat::ffGeneral, 4, 0) + " ";
else if (thisVar->ivalues != NULL)
S = S + FloatToStrF(thisVar->ivalues[ii], TFloatFormat::ffGeneral, 4, 0) + " ";
else
S = S + "-0 ";

if (ii % 10 == 9) {
StateList->Add(S);
S = "";
}
}
else
for (int ll = 0; ll < thisVar->lay; ll++) {
for (int ii = 0; ii < thisVar->dim; ii++) {
if (thisVar->layvalues != NULL)
S = S + FloatToStrF(thisVar->layvalues[ll][ii], TFloatFormat::ffGeneral, 4, 0) + " ";
else if (thisVar->ivalues != NULL)
S = S + FloatToStrF(thisVar->ilayvalues[ll][ii], TFloatFormat::ffGeneral, 4, 0) + " ";
else
S = S + "-0 ";

if (ii % 10 == 9) {
StateList->Add(S);
S = "";
}
}
if (!S.empty()) StateList->Add(S);
S = "";
}
if (!S.empty()) StateList->Add(S);
StateList->Add("######");
}
}
StateList->SaveToFile(SaveStateFileName);
delete StateList;

SaveStateFileName = "";
SaveStateFlag = false;
}
4 changes: 4 additions & 0 deletions crhmcode/src/core/CRHMmain/CRHMmain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ class CRHMmain
string OpenNameReport;
string OpenProjectPath;

string SaveStateFileName;

// string ProjectDirectory;
string ApplicationDir;

Expand Down Expand Up @@ -227,6 +229,8 @@ class CRHMmain
TObject * GetObjectOfVariable(string vname); //added this function from CRHMmainDlg.cpp file.
TObject * GetObjectOfObservation(string vname); //added this function from CRHMmainDlg.cpp file.

void SaveState();

};

//class Classinfo; // used to process shared parameters
9 changes: 5 additions & 4 deletions crhmcode/src/core/Common/Common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "Common.h"
#include "../CRHMmain/CRHMLogger.h"
//#include <math.h>
#include <cmath>
#include <algorithm>
Expand Down Expand Up @@ -129,13 +130,13 @@ double Common::Ice_Bulb(double Tc, double RH, double Pa) {


void Common::Message(const char *s1, const char *s2) {

cout << s1 << ", " << s2 << endl;
CRHMLogger::instance()->log_to_console( s1 + std::string(", ") + s2);
CRHMLogger::instance()->log_run_message(s1 + std::string(", ") + s2);
}

void Common::Message(const string s1, const string s2) {

cout << s1 << ", " << s2 << endl;
CRHMLogger::instance()->log_to_console(s1 + std::string(", ") + s2);
CRHMLogger::instance()->log_run_message(s1 + std::string(", ") + s2);
}

string Common::lowercase(string &s) { //Manishankar: in CRHMmain.cpp, utils.cpp, CRHMmainDlg.cpp
Expand Down