Skip to content

Commit

Permalink
Correction - HiDEM uses HCP, not FCC dense packing
Browse files Browse the repository at this point in the history
  • Loading branch information
J Todd committed Feb 3, 2020
1 parent fd112d7 commit 8d1e470
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ These are part of the compiled code:
|amat.f | Called by effload, does integration |
|tmat.f, ttmat.f | Rotation matrices |
|kmat.f | Stiffness matrix computation |
|glas.f90 | Computing the FCC lattice, dense packing |
|glas.f90 | Computing the HCP lattice, dense packing |
|ranmar.f | Random number generator |
|dt.f90 | Called by glas.f90, finds and write connections to FSfiles |

Expand Down Expand Up @@ -195,7 +195,7 @@ rc2.f90, rc3.f90 - compute the calved size distrib
| Timestep | DT | timestep size | 1.0e-4 |
| Width | S | beam width (relative to unit particle) | 0.7 |
| Youngs Modulus | EF0 | particle bond young's mod, describes interaction between connected particles | 1.0e+9 |
| Size | LS | Something to do with the fcc lattice 'box size' | 100 |
| Size | LS | Something to do with the HCP lattice 'box size' | 100 |
| Domain Inclination | SUB | Angle of the domain vs gravity vector, not used | 0 |
| Water Line | WL | Sea level for buoyancy calc | |
| Grounding Line | GL | 'grounding line' - not used | -100 |
Expand Down
14 changes: 7 additions & 7 deletions src/glas.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
! *************************************************************************
! * The subroutine Initializefcc is based on a legacy code that used to be
! * The subroutine Initializehcp is based on a legacy code that used to be
! * freely distributed on the internet. It has been modified to fit HiDEM.
! * We are not aware who created the original version.
! *************************************************************************
Expand All @@ -14,7 +14,7 @@ MODULE Lattice

CONTAINS

!defines and makes the FCC lattice - dense packing
!defines and makes the HCP lattice - dense packing

!ip - returns number of nodes (in this partition)
!ntasks - how many cores
Expand Down Expand Up @@ -51,8 +51,8 @@ SUBROUTINE FIBG3(base,surf,origin,NN,NTOT,NANS,NRXF,NANPart,InvPartInfo,&
!box is never actualy used...
!b is used, which is box/l, so L never actually enters into this, so it's only
!used for the number of vertical layers
box=2.0d0**(2.0d0/3.0d0)*REAL(l,8) ! box size equal to fcc ground state
CALL Initializefcc(NN,NTOT,NANS,NRXF,NANPart,InvPartInfo,&
box=2.0d0**(2.0d0/3.0d0)*REAL(l,8) ! box size equal to hcp ground state
CALL Initializehcp(NN,NTOT,NANS,NRXF,NANPart,InvPartInfo,&
neighcount,box,l,wrkdir,SCL,surf,base,melt,origin,grid,wl,UC,StrictDomain,RunName,melange_data)

CLOSE(400)
Expand All @@ -62,7 +62,7 @@ END SUBROUTINE FIBG3
!---------------------------------------------------------------!


SUBROUTINE Initializefcc(NN,NTOT,NANS,NRXF,NANPart, &
SUBROUTINE Initializehcp(NN,NTOT,NANS,NRXF,NANPart, &
InvPartInfo,neighcount,box,l,wrkdir,SCL,surf,base,melt,origin,grid,wl,UC,StrictDomain,RunName,&
melange_data)

Expand Down Expand Up @@ -602,7 +602,7 @@ SUBROUTINE Initializefcc(NN,NTOT,NANS,NRXF,NANPart, &
! Our connections - NCN, CN
! Our neighparts - neighparts

END SUBROUTINE Initializefcc
END SUBROUTINE Initializehcp

SUBROUTINE GetBBoxes(NRXF, UT, NN, IsOutlier, BBox, PBBox)

Expand Down Expand Up @@ -1542,7 +1542,7 @@ SUBROUTINE FindBeams(xo, ip, SCL, CN, nbeams, searchdist_in)
max_neigh = 30
ELSE
!Default usage - we are looking for particles which share a beam
!FCC lattice = 12 neighbours
!HCP lattice = 12 neighbours
searchdist = SCL * (1.6**0.5)
max_neigh = 12
END IF
Expand Down

0 comments on commit 8d1e470

Please sign in to comment.