Skip to content
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.

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

Fix typos #100

Merged
merged 2 commits into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Solver/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ addons:
done

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE horseslibclean problemfileclean horsesclean addonsclean
$(info Removing object *.o files from $(NSLITE3D_PATH)/build)
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/CahnHilliardSolver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/IncompressibleNSSolver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode)
INTEGER :: k, eID
!
! *******************************************************************
! Construct the auxiliar state for the fluxes with density positivity
! Construct the auxiliary state for the fluxes with density positivity
! *******************************************************************
!
!$omp do schedule(runtime)
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/MultiphaseSolver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/NavierStokesSolver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################

clean: FORCE
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/NavierStokesSolverRANS/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################

clean: FORCE
Expand Down
6 changes: 3 additions & 3 deletions Solver/src/addons/extractgeometry/GeometryClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ subroutine Cube_Compute(self, mesh, spA)
logical :: success
character(len=LINE_LENGTH) :: solutionFile
!
! ***********************
! Construct auxiliar mesh
! ***********************
! ************************
! Construct auxiliary mesh
! ************************
!
allocate(elems(0:self % Npoints,0:self % Npoints,0:self % Npoints))
allocate(xi(NDIM,0:self % Npoints,0:self % Npoints,0:self % Npoints))
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/addons/extractgeometry/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/addons/horses2tecplot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ end subroutine ProlongSolutionToGaussPoints
!
!/////////////////////////////////////////////////////////////////////////////////////////
!
! Auxiliar subroutines
! Auxiliary subroutines
! --------------------
!
!/////////////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/addons/mergeStatistics/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/addons/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ install: $(PROG)
@echo

##########################################
## Extra auxiliar rules ##
## Extra auxiliary rules ##
##########################################
clean: FORCE
rm -f ./include/*.mod ./lib/*.a ./build/*.o
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/addons/tools/readHDF5.f90
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ subroutine ConstructSimpleMesh_FromHDF5File_( self, fileName, locR)
integer :: nDims
CHARACTER(LEN=255), ALLOCATABLE :: BCNames(:)

! Auxiliar variables
! Auxiliary variables
integer :: i,j,k,l ! Counters
integer :: HOPRNodeID ! Node ID in HOPR
integer :: HCornerMap(8) ! Map from the corner node index of an element to the local high-order node index used in HOPR
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/libs/discretization/SVV.f90
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ end subroutine SVV_GuermondPopov_ENTROPY
!
!//////////////////////////////////////////////////////////////////////////////////////////////////
!
! Auxiliar subroutines
! Auxiliary subroutines
! --------------------
!
!//////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 4 additions & 4 deletions Solver/src/libs/discretization/WallFunctionConnectivity.f90
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Subroutine Initialize_WallConnection(controlVariables, mesh)
oppositeIndex = maxloc(merge(1.0, 0.0, normalAxis == oppositeIndex),dim=1)
linkedElementID = e % Connection(oppositeIndex) % globID
end associate
linkedElementID = getElemntID(mesh, linkedElementID)
linkedElementID = getElementID(mesh, linkedElementID)
wallFaceID(k) = fID
wallElemIds(k) = linkedElementID
!get the normalIndex of the linked element instead of actual element, needed for rotated meshes
Expand Down Expand Up @@ -407,7 +407,7 @@ Subroutine WallStartMeanV(mesh)

End Subroutine WallStartMeanV

integer Function getElemntID(mesh, globeID)
integer Function getElementID(mesh, globeID)

! *******************************************************************
! This subroutine get the element ID based on the global element ID
Expand All @@ -427,7 +427,7 @@ integer Function getElemntID(mesh, globeID)

do eID = 1, mesh % no_of_elements
if (mesh % elements(eID) % globID .eq. globeID) then
getElemntID = eID
getElementID = eID
return
end if
end do
Expand All @@ -437,7 +437,7 @@ integer Function getElemntID(mesh, globeID)
errorMessage(STD_OUT)
stop

End Function getElemntID
End Function getElementID

End Module WallFunctionConnectivity
#endif
2 changes: 1 addition & 1 deletion Solver/src/libs/foundation/Stopwatch.f90
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ end subroutine Event_Destruct
!
!/////////////////////////////////////////////////////////////////////
!
! AUXILIAR PROCEDURES
! AUXILIARY PROCEDURES
! -------------------
!////////////////////////////////////////////////////////////////////
!
Expand Down
4 changes: 2 additions & 2 deletions Solver/src/libs/io/FileReading.f90
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ character(len=LINE_LENGTH) function getPath( inputLine )
!
integer :: pos
!
! Get the last forward slash ocurrence
! ------------------------------------
! Get the last forward slash occurrence
! -------------------------------------
pos = index(inputLine,'/',BACK=.true.)

if ( pos .eq. 0 ) then
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/libs/jacobian/NumericalJacobian.f90
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ subroutine NumJacobian_Compute(this, sem, nEqn, time, Matrix, TimeDerivative, Ti
do thiselmidx = ielm, felm-1
thiselm = ecolors%elmnts(thiselmidx)
IF (this % ndofelm(thiselm)<thisdof) CYCLE
! Redifine used array and counter
! Redefine used array and counter
used = 0
usedctr = 1

Expand Down
6 changes: 3 additions & 3 deletions Solver/src/libs/jacobian/PETScMatrixClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ module PETScMatrixClass
Mat :: A ! Matrix in PETSc context
PetscScalar :: Ashift ! Stores the current shift to the matrix
PetscBool :: withMPI
Vec :: rowvec ! Auxiliar vector with size = num_of_Rows
Vec :: colvec ! Auxiliar vector with size = num_of_Cols
Vec :: rowvec ! Auxiliary vector with size = num_of_Rows
Vec :: colvec ! Auxiliary vector with size = num_of_Cols
PetscInt :: num_of_totalRows
#endif

Expand Down Expand Up @@ -138,7 +138,7 @@ subroutine construct(this,num_of_Rows,num_of_Cols,num_of_Blocks,num_of_TotalRows
!~ CALL CheckPetscErr(ierr,'error in MatSetOption')
end if

! Construct auxiliar vectors
! Construct auxiliary vectors
! --------------------------
call VecCreate(PETSC_COMM_WORLD,this % rowvec,ierr) ; call CheckPetscErr(ierr,'error creating Petsc vector')
call VecSetSizes(this % rowvec,this % num_of_Rows,this % num_of_totalRows,ierr) ; call CheckPetscErr(ierr,'error setting Petsc vector options')
Expand Down
6 changes: 3 additions & 3 deletions Solver/src/libs/jacobian/StaticCondensedMatrixClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ subroutine Static_SetBlockEntry(this, iBlock, jBlock, i, j, value )
integer , intent(in) :: i, j
real(kind=RP) , intent(in) :: value
!-local-variables-----------------------------
integer :: dof_association(2) ! local DOF associtions
integer :: dof_association(2) ! local DOF associations
integer :: perm_Indexes(2) ! local permutation indexes
!---------------------------------------------

Expand Down Expand Up @@ -290,7 +290,7 @@ subroutine Static_AddToBlockEntry(this, iBlock, jBlock, i, j, value )
integer , intent(in) :: i, j
real(kind=RP) , intent(in) :: value
!-local-variables-----------------------------
integer :: dof_association(2) ! local DOF associtions
integer :: dof_association(2) ! local DOF associations
integer :: perm_Indexes(2) ! local permutation indexes
!---------------------------------------------

Expand Down Expand Up @@ -667,7 +667,7 @@ subroutine Static_getSchurComplement(this, Mii_inv, SchurComp)
!----------------------------------------------------------------


! Construct auxiliar matrices
! Construct auxiliary matrices
! ---------------------------
select case (this % MatrixType)
case (SC_MATRIX_CSR)
Expand Down
10 changes: 5 additions & 5 deletions Solver/src/libs/mesh/HexMesh.f90
Original file line number Diff line number Diff line change
Expand Up @@ -3077,7 +3077,7 @@ subroutine HexMesh_LoadSolutionForRestart( self, controlVariables, initial_itera
auxMesh % nodeType = self % nodeType
end if
!
! Construct an auxiliar mesh to read the solution
! Construct an auxiliary mesh to read the solution
! -----------------------------------------------

auxMesh % no_of_elements = self % no_of_elements
Expand Down Expand Up @@ -3107,7 +3107,7 @@ subroutine HexMesh_LoadSolutionForRestart( self, controlVariables, initial_itera
auxMesh % elements(eID) % storage => auxMesh % storage % elements(eID)
end do

! Read the solution in the auxiliar mesh and interpolate to current mesh
! Read the solution in the auxiliary mesh and interpolate to current mesh
! ----------------------------------------------------------------------

call auxMesh % LoadSolution ( fileName, initial_iteration, initial_time , with_gradients, loadFromNSSA=loadFromNSSA)
Expand Down Expand Up @@ -3347,7 +3347,7 @@ subroutine GetDiscretizationError(mesh,controlVariables)

fileName = controlVariables % stringValueForKey("get discretization error of",LINE_LENGTH)

! Construct an auxiliar mesh to read the solution
! Construct an auxiliary mesh to read the solution
! -----------------------------------------------

refMesh % nodeType = mesh % nodeType
Expand All @@ -3367,7 +3367,7 @@ subroutine GetDiscretizationError(mesh,controlVariables)
call refMesh % PrepareForIO
call refMesh % AllocateStorage (NDOF, controlVariables,.FALSE.)

! Read the solution in the auxiliar mesh and interpolate to current mesh
! Read the solution in the auxiliary mesh and interpolate to current mesh
! ----------------------------------------------------------------------

call refMesh % LoadSolution ( fileName, initial_iteration, initial_time )
Expand All @@ -3392,7 +3392,7 @@ end subroutine GetDiscretizationError
!
!////////////////////////////////////////////////////////////////////////
!
! AUXILIAR SUBROUTINES
! AUXILIARY SUBROUTINES
! --------------------
!
!////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/libs/mesh/IBMClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ subroutine IBM_construct( this, controlVariables )
this% STLfilename(STLNum) = controlVariables% stringValueForKey(trim(filename), requestedLength = LINE_LENGTH)
call STLfile_GetMotionInfo( this% stl(STLNum), this% STLfilename(STLNum), this% NumOfSTL )
this% stl(STLNum)% body = STLNum
call this% stl(STLNum)% ReadTesselation( this% STLfilename(STLNum) )
call this% stl(STLNum)% ReadTessellation( this% STLfilename(STLNum) )
call OBB(STLNum)% construct( this% stl(STLNum), this% plotOBB )
this% root(STLNum)% STLNum = STLNum
call OBB(STLNum)% ChangeObjsRefFrame( this% stl(STLNum)% ObjectsList )
Expand Down
4 changes: 2 additions & 2 deletions Solver/src/libs/mesh/Read_HDF5Mesh_HOPR.f90
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ subroutine ConstructMesh_FromHDF5File_( self, fileName, nodes, Nx, Ny, Nz, MeshI
integer :: nDims
CHARACTER(LEN=255), ALLOCATABLE :: BCNames(:)

! Auxiliar variables
! Auxiliary variables
integer :: i,j,k,l ! Counters
integer :: HOPRNodeID ! Node ID in HOPR
integer :: HCornerMap(8) ! Map from the corner node index of an element to the local high-order node index used in HOPR
Expand Down Expand Up @@ -501,7 +501,7 @@ subroutine ConstructMeshPartition_FromHDF5File_( self, fileName, nodes, Nx, Ny,
integer :: nDims
CHARACTER(LEN=255), ALLOCATABLE :: BCNames(:)

! Auxiliar variables
! Auxiliary variables
integer, allocatable :: gHOPR2pHORSESNodeMap(:) ! Map from the global HOPR node index to the local partition index in HORSES3D
integer, allocatable :: globalToLocalElementID(:)
integer :: i,j,k,l, eID, GlobeID ! Counters
Expand Down
4 changes: 2 additions & 2 deletions Solver/src/libs/mesh/StorageClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module StorageClass
real(kind=RP), private, allocatable :: U_xNS(:,:,:,:) ! NSE x-gradients
real(kind=RP), private, allocatable :: U_yNS(:,:,:,:) ! NSE y-gradients
real(kind=RP), private, allocatable :: U_zNS(:,:,:,:) ! NSE z-gradients
real(kind=RP), allocatable :: G_NS(:,:,:,:) ! NSE auxiliar storage
real(kind=RP), allocatable :: G_NS(:,:,:,:) ! NSE auxiliary storage
real(kind=RP), allocatable :: S_NS(:,:,:,:) ! NSE source term
real(kind=RP), allocatable :: S_NSP(:,:,:,:) ! NSE Particles source term
real(kind=RP), allocatable :: mu_NS(:,:,:,:) ! (mu, beta, kappa) artificial
Expand All @@ -95,7 +95,7 @@ module StorageClass
real(kind=RP), dimension(:,:,:,:), allocatable :: mu_y ! CHE chemical potential y-gradient
real(kind=RP), dimension(:,:,:,:), allocatable :: mu_z ! CHE chemical potential z-gradient
real(kind=RP), dimension(:,:,:,:), allocatable :: v ! CHE flow field velocity
real(kind=RP), dimension(:,:,:,:), allocatable :: G_CH ! CHE auxiliar storage
real(kind=RP), dimension(:,:,:,:), allocatable :: G_CH ! CHE auxiliary storage
#endif
contains
procedure :: Assign => ElementStorage_Assign
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/libs/mesh/SurfaceMesh.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ Subroutine getFaceWallDistance(mesh,f,dWall)
nodeEnd = N - 1
end select

! get x of 1 (or 2) and N (or N-1) node of elemnt
! get x of 1 (or 2) and N (or N-1) node of element
xf = f % geom % x(:,0,0)
associate ( e => mesh % elements(eID) )
select case (normalDirection)
Expand Down
8 changes: 4 additions & 4 deletions Solver/src/libs/mesh/TessellationTypes.f90
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ module TessellationTypes
character(len=LINE_LENGTH) :: filename, motionType

contains
procedure :: ReadTesselation
procedure :: ReadTessellation
procedure :: getRotationaMatrix => STLfile_getRotationaMatrix
procedure :: getDisplacement => STLfile_getDisplacement
procedure :: destroy => STLfile_destroy
Expand Down Expand Up @@ -576,7 +576,7 @@ end subroutine DescribePartitions_STLfile
! -------------------------------------------------
! This subroutine reads the .stl file
! -----------------------------------------------
subroutine ReadTesselation( this, filename )
subroutine ReadTessellation( this, filename )
use PhysicsStorage
implicit none
!-arguments--------------------------------
Expand All @@ -596,7 +596,7 @@ subroutine ReadTesselation( this, filename )
open(unit=funit,file='MESH/'//trim(filename)//'.stl',status='old',access='stream',form='unformatted', iostat=fileStat)

if( fileStat .ne. 0 ) then
print *, "Read Tesselation: file '",trim(filename),"' not found"
print *, "Read Tessellation: file '",trim(filename),"' not found"
error stop
end if

Expand Down Expand Up @@ -631,7 +631,7 @@ subroutine ReadTesselation( this, filename )

call this% describe( filename )

end subroutine ReadTesselation
end subroutine ReadTessellation

subroutine STLfile_GetMotionInfo( this, STLfilename, NumOfSTL )
use FileReadingUtilities
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/libs/monitors/FWHObseverClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ Subroutine SourceProlongSolution(source_zone, mesh, eSides)
End Subroutine SourceProlongSolution
!
!/////////////////////////////////////////////////////////////////////////
! AUXILIAR PROCEDURES --------------------------
! AUXILIARY PROCEDURES --------------------------
!/////////////////////////////////////////////////////////////////////////

! get the interpolated value of an array
Expand Down
Loading