Skip to content

[BUG] Fixed passing of settings #384

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

[BUG] Fixed passing of settings #384

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
4 changes: 2 additions & 2 deletions lib/script_controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ int ScriptController::ScriptReadParQuadrature(istream &scr, DataState &state)

int ScriptController::ScriptReadDisplMesh(istream &scr, DataState &state)
{
DataState meshstate;
DataState meshstate = state.CloneEmpty();
string word;

cout << "Script: mesh: " << flush;
Expand Down Expand Up @@ -428,7 +428,7 @@ bool ScriptController::ExecuteScriptCommand()
case Command::DataCollField:
case Command::DataCollQuad:
{
DataState new_state;
DataState new_state = win.data_state.CloneEmpty();

switch (cmd)
{
Expand Down
7 changes: 2 additions & 5 deletions lib/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,8 +1045,7 @@ bool communication_thread::execute_one(std::string ident)
// new solution handled by StreamReader
if (StreamReader::SupportsDataType(ident))
{
DataState tmp;
tmp.fix_elem_orient = glvis_command->FixElementOrientations();
DataState tmp = glvis_command->CurrentDataState().CloneEmpty();
StreamReader reader(tmp);
reader.ReadStream(*is[0], ident);

Expand Down Expand Up @@ -1115,9 +1114,7 @@ bool communication_thread::execute_one(std::string ident)
}
while (1);

DataState tmp;
tmp.fix_elem_orient = glvis_command->FixElementOrientations();
tmp.keep_attr = glvis_command->KeepAttrib();
DataState tmp = glvis_command->CurrentDataState().CloneEmpty();
StreamReader reader(tmp);
reader.ReadStreams(is);

Expand Down
3 changes: 1 addition & 2 deletions lib/threads.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ class GLVisCommand
GLVisCommand(Window &win);

// to be used by worker threads
bool KeepAttrib() { return win.data_state.keep_attr; } // may need to sync this
bool FixElementOrientations() { return win.data_state.fix_elem_orient; }
const DataState& CurrentDataState() const { return win.data_state; }

// called by worker threads
int NewMeshAndSolution(DataState &&ss);
Expand Down
Loading