8000 Added a utility of mHM2OGS by wenqing · Pull Request #96 · ufz/ogs5 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Added a utility of mHM2OGS #96

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.

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
merged 16 commits into from
Jun 7, 2018
Merged

Added a utility of mHM2OGS #96

merged 16 commits into from
Jun 7, 2018

Conversation

wenqing
Copy link
Member
@wenqing wenqing commented Jun 5, 2018

This PR

  1. adds a utility of mHM2OGS (based on an old toolkit, GIS2FEM).
  2. moves some members of CFEMesh to the new class, mHMPreprocessor, for mHM2OGS.
  3. removes unused codes in msh_mesh.h/cpp and removes some other unused files.

@wenqing
Copy link
Member Author
wenqing commented Jun 5, 2018

@norihiro-w In this year, I am preparing the last version of ogs5, ogs5.8. The final version includes what are presented in the PR, merging what developed by BGR for decovelax, improvement in the excavation modelling, bugfixing, code cleaning and so on. Your comments are very appreciated!


03/2010 WW
*/
void ReadShapeFile(std::string const& fname, RasterDataGIS& raster_data)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved from msh_mesh.cpp

}

RasterDataGIS mHMPreprocessor::transfromSingle_mHMdataToNodalFlux(
std::string const& fname, std::string const& ofname, double ratio)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved from msh_mesh.cpp and changed the name from Precipitation2NeumannBC

delete _fem;
}

void mHMPreprocessor::transform_mHMData(const std::string& output_path)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved from msh_mesh.cpp and changed the name from mHM2NeumannBC

@wenqing wenqing force-pushed the 4mHM branch 6 times, most recently from 198469f to 342f7bc Compare June 5, 2018 14:06
vector<double> cell_data_p(size);
vector<double> cell_data_v(size);
for (i = 0; i < size; i++)
for (std::size_t i = 0; i < size; i++)
Copy link
8000
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i is used in line 13620. please check if there is any problem

Copy link
Member Author
@wenqing wenqing Jun 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no problem in computation but this variable name causes confusion. I have changed the source accordingly in the new commit.

MSH/msh_mesh.cpp Outdated
#endif
}
else
elem->SetMark(false);
Copy link
Contributor

Choose a reason for hiding this comment

The reaso 8000 n will be displayed to describe this comment to others. Learn more.

are you sure if the element marks are set true at initial?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the face elements on the top surface are marked by the condition of
n * z >0, where n is the normal vector of an face element, and z=(0, 0, 1)^T. The orientation of the normal vector is guaranteed by a vector from the the center of 3D element to an node of the face.

In this loop over face elements, elements that satisfy n * z >0 are marked as true, and the others are marked as false. Therefore there is no need to set initial status of the face elements.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the new commit, I moved the else if for the bottom surface to the section of #ifdef output_top_z.

@norihiro-w
Copy link
Contributor

@wenqing i have only minor comments

@wenqing
Copy link
Member Author
wenqing commented Jun 6, 2018

@norihiro-w Thanks for your comments.

@norihiro-w
Copy link
Contributor

looks good from my side

@wenqing wenqing merged commit fd3b038 into ufz:master Jun 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0