Skip to content

Commit

Permalink
More places with '
Browse files Browse the repository at this point in the history
  • Loading branch information
william-dawson committed Nov 15, 2023
1 parent f3c2206 commit adf438d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Source/CPlusPlus/EigenBounds.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Matrix_ps;
class EigenBounds : public SolverBase {
public:
//! Compute a bounds on the minimum and maximum eigenvalue of a matrix.
//! Uses Gershgorin's theorem.
//! Uses Gershgorin theorem.
//!\param matrix the matrix to compute the min/max of.
//!\param min_ger_eig a lower bound on the eigenspectrum.
//!\param max_ger_eig an uppder bound on the eigenspectrum.
Expand Down
4 changes: 2 additions & 2 deletions Source/CPlusPlus/InverseSolvers.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Matrix_ps;
class InverseSolvers : public SolverBase {
public:
//! Compute the inverse of a matrix.
//! An implementation of Hotelling's method.
//! An implementation of Hotelling method.
//!\param Overlap the matrix to invert.
//!\param InverseMat = Overlap^-1.
//!\param solver_parameters parameters for the solver
Expand All @@ -24,7 +24,7 @@ class InverseSolvers : public SolverBase {
static void DenseInvert(const Matrix_ps &Overlap, Matrix_ps &InverseMat,
const SolverParameters &solver_parameters);
//! Compute the pseudoinverse of a matrix.
//! An implementation of Hotelling's method, with a different convergence
//! An implementation of Hotelling method, with a different convergence
//! criteria.
//!\param Overlap the matrix to invert.
//!\param InverseMat = Overlap^-1.
Expand Down
4 changes: 2 additions & 2 deletions Source/CPlusPlus/Polynomial.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ class Polynomial : public SolverBase {
void SetCoefficient(int degree, double coefficient);

public:
//! Compute A Matrix Polynomial Using Horner's Method.
//! Compute A Matrix Polynomial Using Horner Method.
//!\param InputMat input matrix.
//!\param OutputMat = p(InputMat)
//!\param solver_parameters parameters for the solver
void HornerCompute(const Matrix_ps &InputMat, Matrix_ps &OutputMat,
const SolverParameters &solver_parameters) const;
//! Compute A Matrix Polynomial Using Paterson and Stockmeyer's Method.
//! Compute A Matrix Polynomial Using Paterson and Stockmeyer Method.
//!\param InputMat input matrix.
//!\param OutputMat = p(InputMat)
//!\param solver_parameters parameters for the solver
Expand Down
8 changes: 4 additions & 4 deletions Source/Fortran/ConvergenceMonitorModule.F90
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
!> A module for monitoring convergence of an iterative algorithim.
!! In basic mode, we monitor that the last value isn't below the tight cutoff.
!! In basic mode, we monitor that the last value is not below the tight cutoff.
!! In automatic mode we monitor the following conditions:
!! o The last value can't be negative
!! o The last value can not be negative
!! o The moving average is within an order of magnitude
!! o The value isn't above the loose cutoff
!! o The value is not above the loose cutoff
MODULE ConvergenceMonitor
USE DataTypesModule, ONLY : NTREAL
USE LoggingModule, ONLY : EnterSubLog, ExitSubLog, WriteElement, &
Expand Down Expand Up @@ -149,7 +149,7 @@ FUNCTION CheckConverged(this, be_verbose) RESULT(conv)
!! Automatic disabled
conv = .TRUE.

!! First check that we've seen enough values to make a judgement.
!! First check that we have seen enough values to make a judgement.
IF (this%nval .LT. SIZE(this%win_long)) conv = .FALSE.

!! Compute Averages
Expand Down
4 changes: 2 additions & 2 deletions Source/Fortran/EigenBoundsModule.F90
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ SUBROUTINE PowerBounds(this, max_value, solver_parameters_in)
CALL ScaleMatrix(vector2, scale_value)
CALL CopyMatrix(vector2, vector)

!! Aitken's Extrapolation
!! Aitken Extrapolation
ritz_values(1) = ritz_values(2)
ritz_values(2) = ritz_values(3)
ritz_values(3) = max_value
Expand All @@ -154,7 +154,7 @@ SUBROUTINE PowerBounds(this, max_value, solver_parameters_in)
aitken_values(3) = ritz_values(3)
END IF

!! Check if Converged - pass the negative value because we're looking
!! Check if Converged - pass the negative value because we are looking
!! for the largest eigenvalue value.
CALL AppendValue(params%monitor, &
& - (aitken_values(3) - aitken_values(2)))
Expand Down
4 changes: 2 additions & 2 deletions Source/Fortran/PSMatrixModule.F90
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ RECURSIVE SUBROUTINE ConstructMatrixFromMatrixMarket_ps(this, file_name, &
OPEN(local_file_handler, file = file_name, iostat = ierr, &
& status = "old")
IF (ierr .NE. 0) THEN
CALL SetGenericError(err, TRIM(file_name) // " doesn't exist", &
CALL SetGenericError(err, TRIM(file_name) // " does not exist", &
& .TRUE.)
END IF
!! Parse the header.
Expand Down Expand Up @@ -600,7 +600,7 @@ RECURSIVE SUBROUTINE ConstructMatrixFromBinary_ps(this, file_name, &
CALL ConstructError(err)
CALL MPI_File_open(process_grid_in%global_comm, file_name, &
& MPI_MODE_RDONLY, MPI_INFO_NULL, mpi_file_handler, ierr)
error_occured = CheckMPIError(err, TRIM(file_name)//" doesn't exist", &
error_occured = CheckMPIError(err, TRIM(file_name)//" does not exist", &
& ierr, .TRUE.)

!! General Sizes
Expand Down
4 changes: 2 additions & 2 deletions Source/Wrapper/PolynomialSolversModule_wrp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ SUBROUTINE SetCoefficient_wrp(ih_this, degree, coefficient) &
CALL SetCoefficient(h_this%DATA, degree, coefficient)
END SUBROUTINE SetCoefficient_wrp
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!> Compute A Matrix Polynomial Using Horner's Method.
!> Compute A Matrix Polynomial Using Horner Method.
SUBROUTINE HornerCompute_wrp(ih_InputMat, ih_OutputMat, ih_polynomial, &
& ih_solver_parameters) BIND(c,name="HornerCompute_wrp")
INTEGER(kind=c_int), INTENT(IN) :: ih_InputMat(SIZE_wrp)
Expand All @@ -79,7 +79,7 @@ SUBROUTINE HornerCompute_wrp(ih_InputMat, ih_OutputMat, ih_polynomial, &
& h_polynomial%DATA, h_solver_parameters%DATA)
END SUBROUTINE HornerCompute_wrp
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!> Compute A Matrix Polynomial Using Paterson and Stockmeyer's method.
!> Compute A Matrix Polynomial Using Paterson and Stockmeyer method.
SUBROUTINE PatersonStockmeyerCompute_wrp(ih_InputMat, ih_OutputMat, &
& ih_polynomial, ih_solver_parameters) &
& BIND(c,name="PatersonStockmeyerCompute_wrp")
Expand Down

0 comments on commit adf438d

Please sign in to comment.