Skip to content

Commit

Permalink
small change for the main file
Browse files Browse the repository at this point in the history
  • Loading branch information
Georgios Deskos authored and Georgios Deskos committed Jun 8, 2019
1 parent bda11ec commit 14bbdfb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ else ifeq ($(FFT),fftw3)
INC=
endif

SRC = decomp_2d.f90 glassman.f90 fft_$(FFT).f90 module_param.f90 io.f90 variables.f90 poisson.f90 les_models.f90 SVV.f90 schemes.f90 convdiff.f90 acl_utils.f90 airfoils.f90 dynstall_legacy.f90 dynstall.f90 acl_elem.f90 acl_controller.f90 acl_turb.f90 acl_out.f90 acl_farm_controller.f90 acl_model.f90 acl_source.f90 adm.f90 incompact3d.f90 navier.f90 filters.f90 derive.f90 parameters.f90 tools.f90 visu.f90 probe.f90 cfl.f90 ABL.f90

SRC = decomp_2d.f90 glassman.f90 fft_$(FFT).f90 module_param.f90 io.f90 variables.f90 poisson.f90 les_models.f90 SVV.f90 schemes.f90 convdiff.f90 acl_utils.f90 airfoils.f90 dynstall_legacy.f90 dynstall.f90 acl_elem.f90 acl_controller.f90 acl_turb.f90 acl_out.f90 acl_farm_controller.f90 acl_model.f90 acl_source.f90 adm.f90 WInc3D.f90 navier.f90 filters.f90 derive.f90 parameters.f90 tools.f90 visu.f90 probe.f90 cfl.f90 ABL.f90
ifneq (,$(findstring DSHM,$(OPTIONS)))
SRC := FreeIPC.f90 $(SRC) $(SRCALM)
OBJ = $(SRC:.f90=.o) alloc_shm.o FreeIPC_c.o
Expand Down
43 changes: 17 additions & 26 deletions incompact3d.f90 → WInc3D.f90
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
!###############################################################################
!This file is part of Incompact3d.
!
!Incompact3d
!Copyright (c) 2012 Eric Lamballais and Sylvain Laizet
![email protected] / [email protected]
!
! Incompact3d is free software: you can redistribute it and/or modify
! it under the terms of the GNU General Public License as published by
! the Free Software Foundation.
!
! Incompact3d is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with the code. If not, see <http://www.gnu.org/licenses/>.
!This file is part of WInc3D.
!-------------------------------------------------------------------------------
!-------------------------------------------------------------------------------
! We kindly request that you cite Incompact3d in your publications and
! We kindly request that you cite WInc3D in your publications and
! presentations. The following citations are suggested:
!
! Deskos, G., S. Laizet, and M. D. Piggott. “Turbulence-resolving simulations
! of wind turbine wakes”. Renewable Energy 134 (2019), pp. 989 –1002.
!
! Deskos, G., S. Laizet, and M. D. Piggott. “Development and validation of the
! higher-order finite-difference wind farm simulator, WInc3D”. 3rd International
! Conference on Renewable Energies Offshore (RENEW2018). Lisbon, Portugal, 2018.
!
! For the core numerical solver the following citations are suggested
!
! 1-Laizet S. & Lamballais E., 2009, High-order compact schemes for
! incompressible flows: a simple and efficient method with the quasi-spectral
! accuracy, J. Comp. Phys., vol 228 (15), pp 5989-6015
Expand All @@ -30,7 +22,7 @@
! Methods in Fluids, vol 67 (11), pp 1735-1757
!################################################################################

PROGRAM incompact3d
PROGRAM WInc3D

USE decomp_2d
USE decomp_2d_poisson
Expand Down Expand Up @@ -94,11 +86,10 @@ PROGRAM incompact3d
print *,'==========================================================='
print *,'==========================================================='
print *,'==========================================================='
print *,'======================Incompact3d=========================='
print *,'===Copyright (c) 2012 Eric Lamballais and Sylvain Laizet==='
print *,'[email protected] / [email protected]'
print *,'Imperial College London Version: '
print *,'Currently in development by G. Deskos'
print *,'======================WInc3D =============================='
print *,'=== High fidelity Wind farm simulator ====================='
print *,' Developed by G. Deskos : [email protected]'
print *,' Code based on incompact3d'
print *,'==========================================================='
print *,'==========================================================='
print *,'==========================================================='
Expand Down Expand Up @@ -430,4 +421,4 @@ PROGRAM incompact3d
call decomp_2d_finalize
CALL MPI_FINALIZE(code)

end PROGRAM incompact3d
end PROGRAM WInc3D

0 comments on commit 14bbdfb

Please sign in to comment.