Skip to content

Created random number table for initial cell positions #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davytorres merged 3 commits into from
Jun 16, 2022
Merged

Created random number table for initial cell positions #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2428d9b
Created random number table for initial cell positions
davytorres Jun 16, 2022
30607e9
Fixes #30
davytorres Jun 16, 2022
7e23a43
Fixes #30
davytorres Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@ program tcell
use tcelsim, only : initialize_positions, create_distribution, move_tcells
implicit none

integer ncells, npositions, nintervals, nveldim
parameter(ncells = 100, npositions = 25, nveldim = 4)
integer ncells, npositions, nintervals, nveldim, ndim
parameter(ncells = 100, npositions = 25, nveldim = 4, ndim = 3)
parameter(nintervals = 10)

double precision vel(nintervals)
double precision cumulative_distribution(0:nintervals)

double precision, allocatable :: random_number_table(:,:,:)
double precision, allocatable :: random_number_table_positions(:,:)
double precision, allocatable :: x(:,:)
double precision, allocatable :: y(:,:)
double precision, allocatable :: z(:,:)

allocate(random_number_table(ncells,npositions,nveldim))
allocate(random_number_table_positions(ncells,ndim))
allocate(x(ncells,npositions))
allocate(y(ncells,npositions))
allocate(z(ncells,npositions))

call initialize_positions(x,y,z,ncells,npositions)
call random_number(random_number_table_positions)

call initialize_positions(x,y,z,random_number_table_positions,ncells,npositions,ndim)

call create_distribution(vel,cumulative_distribution,nintervals)

Expand Down
1 change: 0 additions & 1 deletion src/tcelsim.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module tcelsim
use t_cell_m, only : initialize_positions
use distribution_m, only : create_distribution
use random_numbers_m, only : create_rand_num_table
use move_m, only : move_tcells
implicit none

Expand Down
5 changes: 3 additions & 2 deletions src/tcelsim/t_cell_m.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ module t_cell_m

interface

module subroutine initialize_positions(x,y,z,ncells,npositions)
module subroutine initialize_positions(x,y,z,random_number_table_positions,ncells,npositions,ndim)
implicit none
integer, intent(in) :: ncells,npositions
integer, intent(in) :: ncells,npositions,ndim
double precision, intent(in) :: random_number_table_positions(ncells,ndim)
double precision, intent(out) :: x(ncells,npositions)
double precision, intent(out) :: y(ncells,npositions)
double precision, intent(out) :: z(ncells,npositions)
Expand Down
13 changes: 4 additions & 9 deletions src/tcelsim/t_cell_s.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@

! Local variables
integer i
double precision rr1,rr2,rr3
double precision scaling_factor
double precision, parameter :: scaling_factor = 100.

scaling_factor = 100.d0

! Assign initial positions to T cells randomly in a [100x100x100] grid
do i = 1,ncells
call random_number(rr1)
call random_number(rr2)
call random_number(rr3)
x(i,1) = rr1*scaling_factor
y(i,1) = rr2*scaling_factor
z(i,1) = rr3*scaling_factor
x(i,1) = random_number_table_positions(i,1)*scaling_factor
y(i,1) = random_number_table_positions(i,2)*scaling_factor
z(i,1) = random_number_table_positions(i,3)*scaling_factor
end do

end procedure initialize_positions
Expand Down