Permalink
Browse files

Merge pull request #2 from dmamalis/master

Changing depricated definition
  • Loading branch information...
TimB-QNA committed Jan 30, 2016
2 parents 1d33c20 + 79632ee commit 528ef72ec6d08bbbea67cb16df43151b1641646b
Showing with 32 additions and 15 deletions.
  1. +31 −14 pdStrip/README
  2. +1 −1 pdStrip/src/solver/solver.pro
@@ -1,37 +1,54 @@
1 DESCRIPTION
###1. DESCRIPTION
PDSTRIP is a hydrodynamic strip code for seakeeping. It computes ship motions
for monohulls including sailing boats.
2 COMPILATION ON LINUX
###2. PREREQUISITES
Building and using pdStrip will require some additional packages.
1) Specify your compiler in the Makefile
2) type make
* git
* gcc
* g++
* qt5-qmake
* qt-sdk
* gnuplot
* gfortran
If you are in Ubuntu (or other Debian based distribution) you can install these by issuing the following command
3 EXAMPLE USAGE ON LINUX
`sudo apt-get install git gcc g++ qt5-qmake qt-sdk gnuplot gfortran`
1) change directory to examples
2) run the example with the following command:
###3. COMPILATION ON LINUX
../pdstrip pdstrip.inp
1. Specify your compiler in the Makefile (in a default Linux installation this will automatically be set to the gcc compiler)
2. type make
4 NOTES ON COMPILATION ON WINDOWS
###4. EXAMPLE USAGE ON LINUX
1. change directory to examples
2. run the example with the following command:
`../bin/pdstrip pdstrip.inp`
###5. NOTES ON COMPILATION ON WINDOWS
pdstrip.f90 is known to crash the Salford FTN95 compiler versions 4.7.1 and 4.8.0.
Version 4.7.x works if you choose the "Win32 debug" or "Win32 release" compiler
option.
5 EXAMPLE USAGE ON WINDOWS
###6. EXAMPLE USAGE ON WINDOWS
1) open a command prompt
2) change directory to examples
3) run the program with the following command
1. open a command prompt
2. change directory to examples
3. run the program with the following command
..\pdstrip.EXE pdstrip.inp
`..\pdstrip.EXE pdstrip.inp`
As a Windows user you may also use the graphical interface called PdStripGui.EXE.
@@ -12,4 +12,4 @@ F90 = gfortran
ff90.output = ${QMAKE_FILE_BASE}.o
ff90.commands = $$F90 -c -g ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
ff90.input = F90_SOURCES
QMAKE_EXTRA_UNIX_COMPILERS += ff90
QMAKE_EXTRA_COMPILERS += ff90

0 comments on commit 528ef72

Please sign in to comment.