From b7ce7aa9f6f441b2024ba1d1e52d46a4dc36dcbb Mon Sep 17 00:00:00 2001
From: adfboyd <adfboyd@UbuntuVM.myguest.virtualbox.org>
Date: Mon, 11 Mar 2024 18:42:34 +0000
Subject: [PATCH] checked init_ellip again
---
src/BC-Ellipsoid.f90 | 14 +++++++++-----
src/module_param.f90 | 2 +-
src/xcompact3d.f90 | 22 ++++++++++++++--------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/BC-Ellipsoid.f90 b/src/BC-Ellipsoid.f90
index 493cf93a..ba4a83f0 100644
--- a/src/BC-Ellipsoid.f90
+++ b/src/BC-Ellipsoid.f90
@@ -232,7 +232,7 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
USE param
USE MPI
USE ibm_param
- use dbg_schemes, only: exp_prec
+ use dbg_schemes, only: exp_prec,cos_prec,sin_prec
use ellipsoid_utils, only: NormalizeQuaternion,ellipInertiaCalculate,ellipMassCalculate
@@ -241,8 +241,11 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
real(mytype),dimension(xsize(1),xsize(2),xsize(3)) :: ux1,uy1,uz1
real(mytype),dimension(xsize(1),xsize(2),xsize(3),numscalar) :: phi1
- real(mytype) :: y,um,eqr
+ real(mytype) :: y,um,eqr,x,z
integer :: k,j,i,ii,is,code
+ integer, dimension (:), allocatable :: seed
+ integer :: isize
+
! write(*,*) 'INSIDE INIT ELLIP'
@@ -309,6 +312,7 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
endif
if (sine_z.eq.1) then
uz1(i,j,k)=-sin_prec(x*twopi)*-cos_prec(y*twopi)*cos_prec(z*twopi)
+ endif
if (iscalar == 1) then
phi1(i,j,k,1:numscalar)=sin_prec(x)*sin_prec(y)*cos_prec(z)
endif
@@ -366,9 +370,9 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
enddo
enddo
- #ifdef DEBG
+#ifdef DEBG
if (nrank == 0) write(*,*) '# init end ok'
- #endif
+#endif
@@ -423,7 +427,7 @@ subroutine init_ellip (ux1,uy1,uz1,phi1)
#endif
return
-end subroutine init_ellip
+ end subroutine init_ellip
!********************************************************************
!############################################################################
diff --git a/src/module_param.f90 b/src/module_param.f90
index 218d0f0a..284c8901 100644
--- a/src/module_param.f90
+++ b/src/module_param.f90
@@ -620,7 +620,7 @@ module ibm_param
real(mytype) :: cex,cey,cez,shx,shy,shz,oriw,orii,orij,orik,lvx,lvy,lvz,avx,avy,avz,ra,ubcx,ubcy,ubcz,rads,rho_s,ellip_m,c_air,cvl_scalar,grav_y,grav_x,grav_z
real(mytype) :: position(3),orientation(4),linearVelocity(3),angularVelocity(4),linearAcceleration(3),linearForce(3),torque(3),shape(3),inertia(3,3)
real(mytype) :: position_1(3),linearVelocity_1(3),orientation_1(4),angularVelocity_1(4)
- real(mytype) :: chord,thickness,omega,
+ real(mytype) :: chord,thickness,omega
integer :: sine_init, sine_x, sine_y, sine_z
integer :: inana ! Analytical BC as Input
integer :: imove, nozdrift, force_csv
diff --git a/src/xcompact3d.f90 b/src/xcompact3d.f90
index b2b717ec..c47b94b6 100644
--- a/src/xcompact3d.f90
+++ b/src/xcompact3d.f90
@@ -37,14 +37,20 @@ program xcompact3d
write(*,*) 'Outputting forces'
end if
- do i = 1,100
- x(i) = i
- enddo
- open(unit=3, file='testcsv.dat', status='new',action='write',iostat=ierr)
-
- do i = 1,100
- write(3,*) x(i)
- enddo
+ if (sine_init.eq.1) then
+ write(*,*) 'Generated Sinusoidal flow field.'
+ endif
+
+
+
+! do i = 1,100
+! x(i) = i
+! enddo
+! open(unit=3, file='testcsv.dat', status='new',action='write',iostat=ierr)
+
+! do i = 1,100
+! write(3,*) x(i)
+! enddo
--
GitLab