Skip to content

Commit

Permalink
1. Update documentation and version info
Browse files Browse the repository at this point in the history
2. Remove buoyancy term in k-epsilon turbulence model
  • Loading branch information
sdhzhs committed Mar 2, 2024
1 parent 64a9368 commit 1bfec83
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 28 deletions.
48 changes: 24 additions & 24 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Copyright (c) 2012-2023, Hou Shuo
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the copyright holder nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright (c) 2012-2024, Hou Shuo
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the copyright holder nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ransfoil-x.x.tar.gz is a source package following open source standard
build the program.

ransfoilxx_win64_static.zip is a binary package (built by cross
MinGW-w64) target Windows X64 platform (Windows Vista, 7, 8 or 10, 64bit
MinGW-w64) target Windows X64 platform (Windows 7, 8, 10 and 11, 64bit
version).

A git repository is available at git://git.code.sf.net/p/ransfoil/code
Expand Down
Binary file modified doc/UserGuide.pdf
Binary file not shown.
7 changes: 5 additions & 2 deletions lib/Condiff.f03
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ Subroutine Condiff(scalar)
b(i,j)=Jg(i,j)*(-Px(i,j)-2*(muxx(i,j)+mvyx(i,j))/3+muxx(i,j)+mvxy(i,j))*dx*dy
else if(Proctrl=='incom') then
b(i,j)=Jg(i,j)*(-Px(i,j)+muxx(i,j)+mvxy(i,j))*dx*dy
!if(Turmod=='ke'.or.Turmod=='sst') b(i,j)=b(i,j)-Jg(i,j)*2*rho(i,j)*Tkx(i,j)/3*dx*dy
end if
if(wallfunutype=='parvel'.and.j==1.and.(i>=Ib1.and.i<=Ib2).and.(Turmod=='sa'.and.Walltreat=='wf'.or.Turmod=='sst'.and.Walltreat=='wf'.or.Turmod=='ke')) then
b(i,j)=b(i,j)+rho(i,j)*ustar(i)*DR(i)/Uplus(i)*Xga(i,j)*Yga(i,j)*V(i,j)/da(i,j)**2
Expand All @@ -338,6 +339,7 @@ Subroutine Condiff(scalar)
b(i,j)=Jg(i,j)*(-Py(i,j)-2*(muxy(i,j)+mvyy(i,j))/3+muyx(i,j)+mvyy(i,j))*dx*dy
else if(Proctrl=='incom') then
b(i,j)=Jg(i,j)*(-Py(i,j)+muyx(i,j)+mvyy(i,j))*dx*dy
!if(Turmod=='ke'.or.Turmod=='sst') b(i,j)=b(i,j)-Jg(i,j)*2*rho(i,j)*Tky(i,j)/3*dx*dy
end if
if(wallfunutype=='parvel'.and.j==1.and.(i>=Ib1.and.i<=Ib2).and.(Turmod=='sa'.and.Walltreat=='wf'.or.Turmod=='sst'.and.Walltreat=='wf'.or.Turmod=='ke')) then
b(i,j)=b(i,j)+rho(i,j)*ustar(i)*DR(i)/Uplus(i)*Xga(i,j)*Yga(i,j)*U(i,j)/da(i,j)**2
Expand Down Expand Up @@ -437,7 +439,7 @@ Subroutine Condiff(scalar)
b(i,j)=(mu(i,j)+mut(i,j))*St(i,j)**2*Jg(i,j)*dx*dy
!b(i,j)=b(i,j)-rho(i,j)*Te(i,j)*Jg(i,j)*dx*dy
end if
if(Proctrl=='com') b(i,j)=b(i,j)+g*mut(i,j)*rhoy(i,j)*Jg(i,j)*dx*dy/(rho(i,j)*Prt)-2*rho(i,j)*Te(i,j)*Tk(i,j)*Jg(i,j)*dx*dy/(gama*R*T(i,j)/Ma)
if(Proctrl=='com') b(i,j)=b(i,j)-2*rho(i,j)*Te(i,j)*Tk(i,j)*Jg(i,j)*dx*dy/(gama*R*T(i,j)/Ma)
else if(scalar=='Tk'.and.Turmod=='sst') then
Dampk=rho(i,j)*betastar(i,j)*Tk(i,j)*Tw(i,j)*Jg(i,j)*dx*dy
if(j==1.and.(i>=Ib1.and.i<=Ib2).and.Walltreat=='wf') then
Expand Down Expand Up @@ -468,7 +470,6 @@ Subroutine Condiff(scalar)
else
b(i,j)=Te(i,j)*C1e*(mu(i,j)+mut(i,j))*St(i,j)**2*Jg(i,j)*dx*dy/Tk(i,j)
!b(i,j)=b(i,j)-C2e*rho(i,j)*Te(i,j)*Jg(i,j)*dx*dy/Tk(i,j)
if(Proctrl=='com') b(i,j)=b(i,j)+Te(i,j)*C3e(i,j)*g*mut(i,j)*rhoy(i,j)/(rho(i,j)*Prt)*Jg(i,j)*dx*dy/Tk(i,j)
end if
else if(scalar=='Tw') then
if(j==1.and.(i>=Ib1.and.i<=Ib2)) then
Expand All @@ -483,6 +484,8 @@ Subroutine Condiff(scalar)
else
b(i,j)=b(i,j)+bno(i,j)+cor(i,j)
end if
!DF=Fe(i,j)-Fw(i,j)+Fn(i,j)-Fs(i,j)
!if(DF<0) b(i,j)=b(i,j)-DF*F(i,j)
end DO
end DO
!$OMP END DO
Expand Down
2 changes: 1 addition & 1 deletion src/console.f03
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Program RANSFOIL
print *,"usage: ",trim(argv(1))," [options] [configuration file]"
else if(trim(argv(2))=="--version") then
print *,"ransfoil version 2.2.17"
print *,"Copyright (c) 2012-2023, Hou Shuo"
print *,"Copyright (c) 2012-2024, Hou Shuo"
else if(trim(argv(2))=="-h".or.trim(argv(2))=="--help") then
print *,"usage: ",trim(argv(1))," [options] [configuration file]"
print *,"Console program to mainly calculate aerodynamic parameters of an airfoil by numerically solving the RANS equations. &
Expand Down

0 comments on commit 1bfec83

Please sign in to comment.