From c8b195ce85faa2480aae903f4f05bc528ad48603 Mon Sep 17 00:00:00 2001 From: diener Date: Tue, 30 Sep 2003 17:53:11 +0000 Subject: Added some trim calls to the generation of warning and info messages. As Erik Schnetter correctly pointed out, the previous version would not work correctly. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@159 2a26948c-0e4f-0410-aee8-f1d3e353619c --- src/EHFinder_Check.F90 | 4 ++-- src/EHFinder_FindSurface.F90 | 18 +++++++++--------- src/EHFinder_Generator_Sources.F90 | 20 ++++++++++---------- src/EHFinder_Generator_Sources2.F90 | 12 ++++++------ src/EHFinder_Integrate.F90 | 20 ++++++++++---------- src/EHFinder_ParamCheck.F90 | 4 ++-- src/EHFinder_ReInitialize.F90 | 8 ++++---- src/EHFinder_SetSym.F90 | 10 +++++----- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/EHFinder_Check.F90 b/src/EHFinder_Check.F90 index 1fd07d4..0e5e021 100644 --- a/src/EHFinder_Check.F90 +++ b/src/EHFinder_Check.F90 @@ -77,7 +77,7 @@ subroutine EHFinder_ReInitialize_Check(CCTK_ARGUMENTS) ! Write an info message about the local extremum. write(info_message,'(a39,i3,a6,f12.5)') & 'Minimum f at the extrema for level set ', l, ' is : ',fmin_extremum - call CCTK_INFO(info_message) + call CCTK_INFO(trim(info_message)) ! If the local extremum indicate and imminent pinch off undo the ! re-initialization if this is requested by the user. @@ -86,7 +86,7 @@ subroutine EHFinder_ReInitialize_Check(CCTK_ARGUMENTS) write(info_message,'(a45,i3,a33)') & 'Re-initialization of level set ', l, & ' undone due to imminent pinch-off' - call CCTK_INFO(info_message) + call CCTK_INFO(trim(info_message)) f(:,:,:,l) = fbak(:,:,:,l) eh_mask(:,:,:,l) = eh_mask_bak(:,:,:,l) re_initialize_undone(l) = .true. diff --git a/src/EHFinder_FindSurface.F90 b/src/EHFinder_FindSurface.F90 index 43dbbbc..0090a49 100644 --- a/src/EHFinder_FindSurface.F90 +++ b/src/EHFinder_FindSurface.F90 @@ -63,7 +63,7 @@ subroutine EHFinder_FindSurface(CCTK_ARGUMENTS) ! Write an info message about what is going on. write(info_message,'(a26,i3,a14,i3)') 'Finding points on surface ', sn, & ' in level set ',l - call CCTK_INFO ( info_message ) + call CCTK_INFO ( trim(info_message) ) ! Find information about the local and global properties of the 2D ! Grid arrays. @@ -406,9 +406,9 @@ subroutine EHFinder_FindSurface(CCTK_ARGUMENTS) ! handling character strings that are continued on several lines. if ( interp_handle .lt. 0 ) then warn_message = 'Cannot get handle for interpolation. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing interpolation operators?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing interpolation operators?' + call CCTK_WARN( 0, trim(warn_message) ) end if ! Write the required interpolation order parameter into a fortran string. @@ -424,9 +424,9 @@ subroutine EHFinder_FindSurface(CCTK_ARGUMENTS) call CCTK_CoordSystemHandle ( coord_system_handle, 'cart3d' ) if ( coord_system_handle .lt. 0) then warn_message = 'Cannot get handle for cart3d coordinate system. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing coordinates?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing coordinates?' + call CCTK_WARN( 0, trim(warn_message) ) endif ! Get pointers to the grid arrays containing the interpolation points. @@ -581,7 +581,7 @@ subroutine EHFinder_FindSurface(CCTK_ARGUMENTS) ! print a warning. if ( k .gt. 15 ) then warn_message = 'Newton iteration did not converge! Area may be inaccurate' - call CCTK_WARN(1, warn_message ) + call CCTK_WARN(1, trim(warn_message) ) end if drdtheta = zero @@ -939,7 +939,7 @@ subroutine EHFinder_InfoSurfaces(CCTK_ARGUMENTS) write(info_message,'(a10,i3,a23,i3)') 'There are ',surface_counter, & ' surfaces in level set ',levelset_counter end if - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) integrate_counter = surface_counter diff --git a/src/EHFinder_Generator_Sources.F90 b/src/EHFinder_Generator_Sources.F90 index 74ab49c..c50ee51 100644 --- a/src/EHFinder_Generator_Sources.F90 +++ b/src/EHFinder_Generator_Sources.F90 @@ -53,9 +53,9 @@ subroutine EHFinder_Generator_Sources(CCTK_ARGUMENTS) if ( interp_handle .lt. 0 ) then warn_message = 'Cannot get handle for interpolation. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing interpolation operators?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing interpolation operators?' + call CCTK_WARN( 0, trim(warn_message) ) end if ! Convert the interpolation order parameter to a Fortran string to be placed @@ -73,9 +73,9 @@ subroutine EHFinder_Generator_Sources(CCTK_ARGUMENTS) call CCTK_CoordSystemHandle ( coord_system_handle, 'cart3d' ) if ( coord_system_handle .lt. 0) then warn_message = 'Cannot get handle for cart3d coordinate system. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing coordinates?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing coordinates?' + call CCTK_WARN( 0, trim(warn_message) ) endif ! Find out how many interpolation points are located on this processor. @@ -135,7 +135,7 @@ subroutine EHFinder_Generator_Sources(CCTK_ARGUMENTS) op_indices(1:13), 'operand_indices' ) if ( status .lt. 0 ) then warn_message = 'Cannot set operand indices array in parameter table' - call CCTK_WARN ( 0, warn_message ) + call CCTK_WARN ( 0, trim(warn_message) ) endif ! Set the corresponding table entry for the operation codes. @@ -143,7 +143,7 @@ subroutine EHFinder_Generator_Sources(CCTK_ARGUMENTS) op_codes(1:13), 'operation_codes' ) if ( status .lt. 0 ) then warn_message = 'Cannot set operation codes array in parameter table' - call CCTK_WARN ( 0, warn_message ) + call CCTK_WARN ( 0, trim(warn_message) ) endif ! Call the interpolator. @@ -199,14 +199,14 @@ subroutine EHFinder_Generator_Sources(CCTK_ARGUMENTS) op_indices, 'operand_indices' ) if ( status .lt. 0 ) then warn_message = 'Cannot set operand indices array in parameter table' - call CCTK_WARN ( 0, warn_message ) + call CCTK_WARN ( 0, trim(warn_message) ) endif call Util_TableSetIntArray ( status, table_handle, 14, & op_codes, 'operation_codes' ) if ( status .lt. 0 ) then warn_message = 'Cannot set operation codes array in parameter table' - call CCTK_WARN ( 0, warn_message ) + call CCTK_WARN ( 0, trim(warn_message) ) endif call CCTK_InterpGridArrays ( status, cctkGH, 3, interp_handle, & diff --git a/src/EHFinder_Generator_Sources2.F90 b/src/EHFinder_Generator_Sources2.F90 index 704faaf..7f36c05 100644 --- a/src/EHFinder_Generator_Sources2.F90 +++ b/src/EHFinder_Generator_Sources2.F90 @@ -48,9 +48,9 @@ subroutine EHFinder_Generator_Sources2(CCTK_ARGUMENTS) if ( interp_handle .lt. 0 ) then warn_message = 'Cannot get handle for interpolation. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing interpolation operators?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing interpolation operators?' + call CCTK_WARN( 0, trim(warn_message) ) end if ! Convert the interpolation order parameter to a Fortran string to be placed @@ -68,9 +68,9 @@ subroutine EHFinder_Generator_Sources2(CCTK_ARGUMENTS) call CCTK_CoordSystemHandle ( coord_system_handle, 'cart3d' ) if ( coord_system_handle .lt. 0) then warn_message = 'Cannot get handle for cart3d coordinate system. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing coordinates?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing coordinates?' + call CCTK_WARN( 0, trim(warn_message) ) endif #include "include/physical_part.h" diff --git a/src/EHFinder_Integrate.F90 b/src/EHFinder_Integrate.F90 index 9e5257d..b8b8fcb 100644 --- a/src/EHFinder_Integrate.F90 +++ b/src/EHFinder_Integrate.F90 @@ -92,9 +92,9 @@ subroutine EHFinder_FindSurfaceElement(CCTK_ARGUMENTS) if ( interp_handle .lt. 0 ) then warn_message = 'Cannot get handle for interpolation. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing interpolation operators?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing interpolation operators?' + call CCTK_WARN( 0, trim(warn_message) ) end if ! Write the interpolation order parameter into a string @@ -110,9 +110,9 @@ subroutine EHFinder_FindSurfaceElement(CCTK_ARGUMENTS) call CCTK_CoordSystemHandle ( coord_system_handle, 'cart3d' ) if ( coord_system_handle .lt. 0) then warn_message = 'Cannot get handle for cart3d coordinate system. ' - warn_message = warn_message//'Forgot to activate an implementation ' - warn_message = warn_message//'providing coordinates?' - call CCTK_WARN( 0, warn_message ) + warn_message = trim(warn_message)//'Forgot to activate an implementation ' + warn_message = trim(warn_message)//'providing coordinates?' + call CCTK_WARN( 0, trim(warn_message) ) endif ! Get the pointers to the interpolation points. @@ -271,7 +271,7 @@ subroutine EHFinder_IntegrateArea(CCTK_ARGUMENTS) ! Write an info message reporting the area found. write(info_message,'(a15,f10.5)') 'Horizon area = ',eh_area_tmp - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) ! Figure out the bounds of the area storage grid array. call CCTK_GrouplbndGN ( ierr, cctkGH, 1, lbnd, 'ehfinder::eh_area2' ) @@ -394,7 +394,7 @@ subroutine EHFinder_IntegrateCentroid(CCTK_ARGUMENTS) eh_centroid2_x(sn,l), & eh_centroid2_y(sn,l), & eh_centroid2_z(sn,l) - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) end subroutine EHFinder_IntegrateCentroid @@ -509,7 +509,7 @@ subroutine EHFinder_IntegrateCircumference(CCTK_ARGUMENTS) ! Write an info message with the calculated circunference. write(info_message,'(a35,f10.5)') 'Horizon equatorial circumference = ', & eq_circ - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) ! Now do the same for the polar circomference. call CCTK_INFO ( 'Integrating polar circumference' ) @@ -543,7 +543,7 @@ subroutine EHFinder_IntegrateCircumference(CCTK_ARGUMENTS) ! Write an info message with the calculated circumference. write(info_message,'(a30,f10.5)') 'Horizon polar circumference = ',pol_circ - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) end subroutine EHFinder_IntegrateCircumference diff --git a/src/EHFinder_ParamCheck.F90 b/src/EHFinder_ParamCheck.F90 index 9640d45..c2352db 100644 --- a/src/EHFinder_ParamCheck.F90 +++ b/src/EHFinder_ParamCheck.F90 @@ -25,8 +25,8 @@ subroutine EHFinder_ParamCheck(CCTK_ARGUMENTS) if ( ( .not. CCTK_EQUALS(metric_type,'physical') ) .and. & ( .not. CCTK_EQUALS(metric_type,'static conformal') ) ) then param_warn = 'Unknown ADMBase::metric_type - known types are "physical" ' - param_warn = param_warn//'and "static conformal"' - call CCTK_PARAMWARN ( param_warn ) + param_warn = trim(param_warn)//'and "static conformal"' + call CCTK_PARAMWARN ( trim(param_warn) ) end if end subroutine EHFinder_ParamCheck diff --git a/src/EHFinder_ReInitialize.F90 b/src/EHFinder_ReInitialize.F90 index 3ff473a..7f53df7 100644 --- a/src/EHFinder_ReInitialize.F90 +++ b/src/EHFinder_ReInitialize.F90 @@ -93,8 +93,8 @@ subroutine EHFinder_ReInitializeControl(CCTK_ARGUMENTS) if ( all ( .not. re_init_this_level_set ) ) then re_init_control = 0 info_message = 'No zero-points of the level set functions. ' - info_message = info_message//'No re-initialization performed.' - call CCTK_INFO ( info_message ) + info_message = trim(info_message)//'No re-initialization performed.' + call CCTK_INFO ( trim(info_message) ) end if end subroutine EHFinder_ReInitializeControl @@ -332,7 +332,7 @@ subroutine EHFinder_ReInitializeRK2_2(CCTK_ARGUMENTS) if ( re_init_control .eq. 0 ) then write(info_message,'(a35,i5,a12)') & 'PDE re-initialization complete in ',ncalls,' iterations.' - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) end if ! If we ran out of iterations without converging, print a level 1 warning @@ -487,7 +487,7 @@ subroutine EHFinder_ReInitializeEuler(CCTK_ARGUMENTS) if ( re_init_control .eq. 0 ) then write(info_message,'(a35,i5,a12)') & 'PDE re-initialization complete in ',ncalls,' iterations.' - call CCTK_INFO(info_message) + call CCTK_INFO( trim(info_message) ) end if ! If we ran out of iterations without converging, print a level 1 warning diff --git a/src/EHFinder_SetSym.F90 b/src/EHFinder_SetSym.F90 index 7811406..14592e6 100644 --- a/src/EHFinder_SetSym.F90 +++ b/src/EHFinder_SetSym.F90 @@ -57,8 +57,8 @@ subroutine EHFinder_ApplySymAll(CCTK_ARGUMENTS) call CartSymGN ( ierr, cctkGH, 'ehfinder::f' ) if ( ierr .gt. 0 ) then warn_message = 'Failed to perform symmetry operation on the level ' - warn_message = warn_message//'set function' - call CCTK_WARN( 1, warn_message ) + warn_message = trim(warn_message)//'set function' + call CCTK_WARN( 1, trim(warn_message) ) end if ! Apply symmetry for the mask function. @@ -87,8 +87,8 @@ subroutine EHFinder_ApplySymF(CCTK_ARGUMENTS) call CartSymGN ( ierr, cctkGH, 'ehfinder::f' ) if ( ierr .gt. 0 ) then warn_message = 'Failed to perform symmetry operation on the level ' - warn_message = warn_message//'set function' - call CCTK_WARN( 1, warn_message ) + warn_message = trim(warn_message)//'set function' + call CCTK_WARN( 1, trim(warn_message) ) end if return @@ -131,7 +131,7 @@ subroutine EHFinder_ApplySymSC(CCTK_ARGUMENTS) call CartSymGN ( ierr, cctkGH, 'ehfinder::surface_index' ) if ( ierr .gt. 0 ) then warn_message = 'Failed to perform symmetry operation on the surface index' - call CCTK_WARN( 1, warn_message ) + call CCTK_WARN( 1, trim(warn_message) ) end if return -- cgit v1.2.3