Merge branch 'integration-ihc-wavemodels' into 'develop'

src/waveModels/Make/files

...waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.C

...waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.H

...s/waveGenerationModels/derived/McCowan/McCowanWaveModel.C

...s/waveGenerationModels/derived/McCowan/McCowanWaveModel.H

...e/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water

...tiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh

...m/laminar/waveExampleCnoidal/constant/transportProperties

...erFoam/laminar/waveExampleCnoidal/constant/waveProperties

.../interFoam/laminar/waveExampleSolitary/0.orig/alpha.water

...iphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh

.../laminar/waveExampleSolitary/constant/transportProperties

...rFoam/laminar/waveExampleSolitary/constant/waveProperties

...se/interFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/U

...am/laminar/waveExampleSolitaryGrimshaw/0.orig/alpha.water

...nterFoam/laminar/waveExampleSolitaryGrimshaw/0.orig/p_rgh

...se/interFoam/laminar/waveExampleSolitaryGrimshaw/Allclean

...hase/interFoam/laminar/waveExampleSolitaryGrimshaw/Allrun

.../interFoam/laminar/waveExampleSolitaryGrimshaw/constant/g

.../waveExampleSolitaryGrimshaw/constant/transportProperties