Skip to content

Commit

Permalink
Merge pull request #3 from Mohid-Water-Modelling-System/master
Browse files Browse the repository at this point in the history
Fork update
  • Loading branch information
JoaoBSobrinho authored Aug 17, 2018
2 parents c3f32d2 + 0e49c00 commit 4913348
Show file tree
Hide file tree
Showing 11 changed files with 7,729 additions and 136 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -332,26 +332,26 @@
<File RelativePath="..\..\..\..\Software\MOHIDLand\ModuleIrrigation.F90"/>
<File RelativePath="..\..\..\..\Software\MOHIDLand\ModulePorousMedia.f90"/>
<File RelativePath="..\..\..\..\Software\MOHIDLand\ModulePorousMediaProperties.F90">
<FileConfiguration Name="Release Double|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double OpenMP PhreeqC|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double Parallel|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release OpenMP|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release OpenMP|Win32">
<FileConfiguration Name="Release Double Parallel|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double OpenMP|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double Parallel|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double Phreeqc|Win32">
<FileConfiguration Name="Release OpenMP|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double OpenMP PhreeqC|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double Phreeqc|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release Double Phreeqc|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
<File RelativePath="..\..\..\..\Software\MOHIDLand\ModuleReservoirs.F90"/>
Expand Down
38 changes: 25 additions & 13 deletions Solutions/mohid-in-linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
---
This repository is an attempt to compile MOHID in a linux machine with Ubuntu or CentOS linux distro and intel compiler ifort.

## Minimum system requirements:
## Minimum system requirements ##
Install the following softwares:
* intel compiler C and Fortran
* zlib
* hdf5
* netcdf (optional)
* proj4 (optional)
* proj4fortran (optional)
* mpich (optional)
* netcdf
* proj4
* proj4fortran
* intel mpi or mpich or openMPI, etc.(optional)
* mohid src

or
run ``./install_req.sh -opt1 -opt2 ...``
**Install intel compiler first!** `install_req.sh` will download and install all libraries required to compile MOHID. **You must respect the instalation order**. For more information or see all option available, run:
**Install intel compiler first!** and after use ``./install_req.sh -opt1 -opt2 ...`` to install library requirements
`install_req.sh` will download and install all libraries required to compile MOHID. **You must respect the instalation order**. To see help menu run:
```
./install_req.sh -h
```
Update all paths in script to fit your setup.
**Update all paths in script to fit your setup.**

## Compile
## Compile ##
To compile MOHID Water and/or MOHID Land, you must compile first MOHID Base 1 and MOHID Base 2. This will create all .mod files used to compile MOHID.
```
./compile.sh -mb1 -mb2
Expand All @@ -40,7 +40,18 @@ For more information or see all option available, run:
```
Update all paths in script to fit your setup.

## Notes: ##
## Test the installation ##
Inside test directory there are two test cases, one for mohid water and another one for mohid land. Just execute `mohid-in-linux/test/mohidwater/25m_deep/exe/MohidWater.exe` or `mohid-in-linux/test/mohidland/schematicWatershed/exe/MohidLand.exe` to see if there's no errors.

If you see `Program Mohid Water successfully terminated` or `Program Mohid Land successfully terminated`, your installation was sucessfull.

If you want to run your own project, make a link for `bin/MohidWater.exe` or `bin/MohidLand.exe`

```
ln -s <MOHID_INSTALLATION_PATH>/Mohid/Solutions/mohid-in-linux/bin/MohidWater.exe <YOUR_PROJECT_PATH>/exe/MohidWater.exe
```

## Notes ##
* You must download and install intel compiler C and Fortran first, before run scripts. intel compiler free for 30 days. You can do it here: <https://software.intel.com/en-us/intel-parallel-studio-xe>
* If you are a Academic Researcher or a Student you can get intel compiler for free here: <https://software.intel.com/en-us/qualify-for-free-software>
* See <https://software.intel.com/en-us/get-started-with-parallel-studio-xe-for-linux> to learn more about what to install.
Expand All @@ -62,9 +73,10 @@ export FCFLAGS='-O3 -xHost -ip'
* If necessary use ext2uppercase.sh to uppercase all .f90 to .F90 extensions
* If necessary use dos2unix linux command:
` find . -name *.F90 -exec dos2unix {} \; `
* If you want to use MPI, install MPI in your system and make MPI flag true in compile.sh. MPI only work if your project has nested domains.

## Help, Bugs, Feedback
## Help, Bugs, Feedback ##
If you need help with compile MOHID in linux, you can hang out by mail: <[email protected]> or consult our [wiki](http://wiki.mohid.com). You can also subscribe to our [forum](http://forum.mohid.com). To report bugs, please contact any developers. More information consult <http://www.mohid.com>

## License
GNU General Public License. See the [GNU General Public License](http://www.gnu.org/copyleft/gpl.html) web page for more information.
## License ##
GNU General Public License. See the [GNU General Public License](http://www.gnu.org/copyleft/gpl.html) web page for more information.
Loading

0 comments on commit 4913348

Please sign in to comment.