Skip to content

Commit

Permalink
Merge pull request UCLA-Plasma-Simulation-Group#6 from caozigao/dev
Browse files Browse the repository at this point in the history
Fix typos in fdist3d and input file
  • Loading branch information
caozigao authored Oct 22, 2018
2 parents 9ecf469 + 2d810cf commit 4aa4b0a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions input_file/laptop/qpinput.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
"center" : [0.0,0.0,2.5],
"sigma" : [0.25,0.25,0.4],
"sigma_v" : [3.0,3.0,100.0],
"piesewise_fz" : [0.0,1.0,0.0],
"piesewise_z" : [2.0,10.0,10.1],
"piecewise_fz" : [0.0,1.0,0.0],
"piecewise_z" : [2.0,10.0,10.1],
"centroid_x" : [0.0,0.0,0.0],
"centroid_y" : [0.0,0.0,0.0],
"diag" :
Expand Down
9 changes: 5 additions & 4 deletions source/fdist3d_class.f03
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ end subroutine ab_init_fdist3d
end type fdist3d_000
!
type, extends(fdist3d) :: fdist3d_001
! Bi Gaussian and piesewise in z (the same particle charge)
! Bi Gaussian and piecewise in z (the same particle charge)
private

integer :: npx, npy, npz
Expand Down Expand Up @@ -413,6 +413,7 @@ subroutine init_fdist3d_001(this,input,i)
call input%get(trim(s1)//'.sigma(2)',sigy)
call input%get(trim(s1)//'.sigma_v(1)',sigvx)
call input%get(trim(s1)//'.sigma_v(2)',sigvy)
call input%get(trim(s1)//'.sigma_v(3)',sigvz)
call input%get(trim(s1)//'.centroid_x(1)',cx1)
call input%get(trim(s1)//'.centroid_x(2)',cx2)
call input%get(trim(s1)//'.centroid_x(3)',cx3)
Expand All @@ -423,13 +424,13 @@ subroutine init_fdist3d_001(this,input,i)
call input%get(trim(s1)//'.gamma',gamma)
call input%get(trim(s1)//'.peak_density',np)
call input%get(trim(s1)//'.npmax',npmax)
call input%get(trim(s1)//'.piesewise_fz',this%fz)
call input%get(trim(s1)//'.piesewise_z',this%z)
call input%get(trim(s1)//'.piecewise_fz',this%fz)
call input%get(trim(s1)//'.piecewise_z',this%z)

sumz = 0.0
do ii = 2, size(this%z)
if (this%z(ii)<=this%z(ii-1)) then
write (erstr,*) 'Piesewise_z is not monotonically increasing'
write (erstr,*) 'Piecewise_z is not monotonically increasing'
call this%err%equit(class//sname//erstr)
return
end if
Expand Down

0 comments on commit 4aa4b0a

Please sign in to comment.