<p><b>dwj07@fsu.edu</b> 2011-10-17 21:27:02 -0600 (Mon, 17 Oct 2011)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Fixing up dimensional identifiers (2D, 3D, etc..)<br>
</p><hr noshade><pre><font color="gray">Modified: branches/source_renaming/src/operators/mpas_rbf_interpolation.F
===================================================================
--- branches/source_renaming/src/operators/mpas_rbf_interpolation.F 2011-10-17 21:43:19 UTC (rev 1105)
+++ branches/source_renaming/src/operators/mpas_rbf_interpolation.F 2011-10-18 03:27:02 UTC (rev 1106)
@@ -88,8 +88,8 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
public :: mpas_rbf_interp_func_3D_vec_const_dir_comp_coeffs, &
mpas_rbf_interp_func_3D_plane_vec_const_dir_comp_coeffs!, &
- !mpas_rbf_interp_func_3d_vec_const_tan_neu_comp_coeffs, &
- !mpas_rbf_interp_func_3d_plane_vec_const_tan_neu_comp_coeffs
+ !mpas_rbf_interp_func_3D_vec_const_tan_neu_comp_coeffs, &
+ !mpas_rbf_interp_func_3D_plane_vec_const_tan_neu_comp_coeffs
contains
@@ -205,7 +205,7 @@
! coefficients - the coefficients needed to perform interpolation of the funciton
! at destination points yet to be specified
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_loc_2d_sca_const_comp_coeffs(pointCount, coeffCount, &
+ subroutine mpas_rbf_interp_loc_2D_sca_const_comp_coeffs(pointCount, coeffCount, &
points, fieldValues, alpha, coefficients)
integer, intent(in) :: pointCount, coeffCount
@@ -242,7 +242,7 @@
call mpas_legs(matrix(1:matrixSize,1:matrixSize), matrixSize, rhs(1:matrixSize), &
coefficients(1:matrixSize), pivotIndices(1:matrixSize))
- end subroutine mpas_rbf_interp_loc_2d_sca_const_comp_coeffs
+ end subroutine mpas_rbf_interp_loc_2D_sca_const_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 2D that can be used to
@@ -263,7 +263,7 @@
! coefficients - the coefficients needed to perform interpolation of the funciton
! at destination points yet to be specified
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_loc_2d_sca_lin_comp_coeffs(pointCount, coeffCount, &
+ subroutine mpas_rbf_interp_loc_2D_sca_lin_comp_coeffs(pointCount, coeffCount, &
points, fieldValues, alpha, coefficients)
integer, intent(in) :: pointCount, coeffCount
@@ -301,7 +301,7 @@
call mpas_legs(matrix(1:matrixSize,1:matrixSize), matrixSize, rhs(1:matrixSize), &
coefficients(1:matrixSize), pivotIndices(1:matrixSize))
- end subroutine mpas_rbf_interp_loc_2d_sca_lin_comp_coeffs
+ end subroutine mpas_rbf_interp_loc_2D_sca_lin_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Evalute a scalar function in 2D using coefficients computed in
@@ -329,7 +329,7 @@
! derivs - the value of the function, the 2 components of its Jacobian and
! the 3 unique components of its Hessian at the evaluationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_loc_2d_sca_const_eval_with_derivs(fieldCount, coeffCount, &
+ subroutine mpas_rbf_interp_loc_2D_sca_const_eval_with_derivs(fieldCount, coeffCount, &
pointCount, coefficients, evaluationPoint, points, alpha, derivs)
integer, intent(in) :: fieldCount, coeffCount, pointCount
real(kind=RKIND), dimension(coeffCount, fieldCount), intent(in) :: coefficients
@@ -369,7 +369,7 @@
end if
end do
derivs(1,:) = derivs(1,:) + coefficients(pointCount+1,:)
- end subroutine mpas_rbf_interp_loc_2d_sca_const_eval_with_derivs
+ end subroutine mpas_rbf_interp_loc_2D_sca_const_eval_with_derivs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Evalute a scalar function in 2D using coefficients computed in
@@ -397,7 +397,7 @@
! derivs - the value of the function, the 2 components of its Jacobian and
! the 3 unique components of its Hessian at the evaluationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_loc_2d_sca_lin_eval_with_derivs(fieldCount, coeffCount, &
+ subroutine mpas_rbf_interp_loc_2D_sca_lin_eval_with_derivs(fieldCount, coeffCount, &
pointCount, coefficients, evaluationPoint, points, alpha, derivs)
integer, intent(in) :: fieldCount, coeffCount, pointCount
real(kind=RKIND), dimension(coeffCount, fieldCount), intent(in) :: coefficients
@@ -442,7 +442,7 @@
derivs(2,:) = derivs(2,:) + coefficients(pointCount+2,:)
derivs(3,:) = derivs(3,:) + coefficients(pointCount+3,:)
- end subroutine mpas_rbf_interp_loc_2d_sca_lin_eval_with_derivs
+ end subroutine mpas_rbf_interp_loc_2D_sca_lin_eval_with_derivs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -467,7 +467,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_sca_const_dir_comp_coeffs( &
+ subroutine mpas_rbf_interp_func_3D_sca_const_dir_comp_coeffs( &
pointCount, sourcePoints, destinationPoint, alpha, coefficients)
integer, intent(in) :: pointCount
@@ -513,7 +513,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_sca_const_dir_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_sca_const_dir_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in a plane in 3D that can be used to
@@ -543,7 +543,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_plane_sca_lin_dir_comp_coeffs( &
+ subroutine mpas_rbf_interp_func_3D_plane_sca_lin_dir_comp_coeffs( &
pointCount, sourcePoints, destinationPoint, &
alpha, planeBasisVectors, coefficients)
@@ -596,7 +596,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_plane_sca_lin_dir_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_plane_sca_lin_dir_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -621,7 +621,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_sca_lin_dir_comp_coeffs(pointCount, &
+ subroutine mpas_rbf_interp_func_3D_sca_lin_dir_comp_coeffs(pointCount, &
sourcePoints, destinationPoint, alpha, coefficients)
integer, intent(in) :: pointCount
@@ -670,7 +670,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_sca_lin_dir_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_sca_lin_dir_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -704,7 +704,7 @@
! neumannCoefficients - the coefficients used to interpolate a function with Neumann
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_sca_const_dir_neu_comp_coeffs( &
+ subroutine mpas_rbf_interp_func_3D_sca_const_dir_neu_comp_coeffs( &
pointCount, sourcePoints, isInterface, interfaceNormals, destinationPoint, &
alpha, dirichletCoefficients, neumannCoefficients)
@@ -772,7 +772,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_sca_const_dir_neu_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_sca_const_dir_neu_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in a plane in 3D that can be used to
@@ -811,7 +811,7 @@
! neumannCoefficients - the coefficients used to interpolate a function with Neumann
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_plane_sca_lin_dir_neu_comp_coeffs( &
+ subroutine mpas_rbf_interp_func_3D_plane_sca_lin_dir_neu_comp_coeffs( &
pointCount, sourcePoints, isInterface, interfaceNormals, destinationPoint, &
alpha, planeBasisVectors, dirichletCoefficients, neumannCoefficients)
@@ -889,7 +889,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_plane_sca_lin_dir_neu_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_plane_sca_lin_dir_neu_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -923,7 +923,7 @@
! neumannCoefficients - the coefficients used to interpolate a function with Neumann
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_sca_lin_dir_neu_comp_coeffs(pointCount, &
+ subroutine mpas_rbf_interp_func_3D_sca_lin_dir_neu_comp_coeffs(pointCount, &
sourcePoints, isInterface, interfaceNormals, destinationPoint, &
alpha, dirichletCoefficients, neumannCoefficients)
@@ -997,7 +997,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_sca_lin_dir_neu_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_sca_lin_dir_neu_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -1026,7 +1026,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_vec_const_dir_comp_coeffs(pointCount, &
+ subroutine mpas_rbf_interp_func_3D_vec_const_dir_comp_coeffs(pointCount, &
sourcePoints, unitVectors, destinationPoint, &
alpha, coefficients)
@@ -1082,7 +1082,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_vec_const_dir_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_vec_const_dir_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -1116,7 +1116,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_plane_vec_const_dir_comp_coeffs(pointCount, &
+ subroutine mpas_rbf_interp_func_3D_plane_vec_const_dir_comp_coeffs(pointCount, &
sourcePoints, unitVectors, destinationPoint, &
alpha, planeBasisVectors, coefficients)
@@ -1191,7 +1191,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_plane_vec_const_dir_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_plane_vec_const_dir_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -1228,7 +1228,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_vec_const_tan_neu_comp_coeffs(pointCount, &
+ subroutine mpas_rbf_interp_func_3D_vec_const_tan_neu_comp_coeffs(pointCount, &
sourcePoints, isTangentToInterface, normalVectorIndex, unitVectors, destinationPoint, &
alpha, coefficients)
@@ -1287,7 +1287,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_vec_const_tan_neu_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_vec_const_tan_neu_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Purpose: Compute interpolation coefficients in 3D that can be used to
@@ -1329,7 +1329,7 @@
! coefficients - the coefficients used to interpolate a function with Dirichlet
! boundary conditions to the specified destinationPoint
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- subroutine mpas_rbf_interp_func_3d_plane_vec_const_tan_neu_comp_coeffs(&
+ subroutine mpas_rbf_interp_func_3D_plane_vec_const_tan_neu_comp_coeffs(&
pointCount, sourcePoints, isTangentToInterface, normalVectorIndex, unitVectors, &
destinationPoint, alpha, planeBasisVectors, coefficients)
@@ -1407,7 +1407,7 @@
deallocate(coeffs)
deallocate(pivotIndices)
- end subroutine mpas_rbf_interp_func_3d_plane_vec_const_tan_neu_comp_coeffs
+ end subroutine mpas_rbf_interp_func_3D_plane_vec_const_tan_neu_comp_coeffs
!!!!!!!!!!!!!!!!!!!!!
Modified: branches/source_renaming/src/operators/mpas_vector_reconstruction.F
===================================================================
--- branches/source_renaming/src/operators/mpas_vector_reconstruction.F 2011-10-17 21:43:19 UTC (rev 1105)
+++ branches/source_renaming/src/operators/mpas_vector_reconstruction.F 2011-10-18 03:27:02 UTC (rev 1106)
@@ -95,7 +95,7 @@
tangentPlane(1,:) = cellTangentPlane(:,1,iCell)
tangentPlane(2,:) = cellTangentPlane(:,2,iCell)
- call mpas_rbf_interp_func_3d_plane_vec_const_dir_comp_coeffs(pointCount, &
+ call mpas_rbf_interp_func_3D_plane_vec_const_dir_comp_coeffs(pointCount, &
edgeOnCellLocations(1:pointCount,:), &
edgeOnCellNormals(1:pointCount,:), &
cellCenter, alpha, tangentPlane, coeffs(1:pointCount,:))
</font>
</pre>