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

Use Cray-compatible syntax for multi-line string literals #1554

Merged
merged 1 commit into from
Jul 26, 2024
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
4 changes: 2 additions & 2 deletions diag_manager/diag_data.F90
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,8 @@ function get_var_type(var) &
type is (character(len=*))
var_type = string
class default
call mpp_error(FATAL, "get_var_type:: The variable does not have a supported type. "&
&"The supported types are r4, r8, i4, i8 and string.")
call mpp_error(FATAL, "get_var_type:: The variable does not have a supported type. &
&The supported types are r4, r8, i4, i8 and string.")
end select
end function get_var_type

Expand Down
8 changes: 4 additions & 4 deletions diag_manager/fms_diag_axis_object.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,8 @@ subroutine check_if_valid_domain_position(domain_position)
select case (domain_position)
case (CENTER, NORTH, EAST)
case default
call mpp_error(FATAL, "diag_axit_init: Invalid domain_positon. "&
"The acceptable values are NORTH, EAST, CENTER")
call mpp_error(FATAL, "diag_axit_init: Invalid domain_positon. &
&The acceptable values are NORTH, EAST, CENTER")
end select
end subroutine check_if_valid_domain_position

Expand All @@ -1045,8 +1045,8 @@ subroutine check_if_valid_direction(direction)
select case(direction)
case(-1, 0, 1)
case default
call mpp_error(FATAL, "diag_axit_init: Invalid direction. "&
"The acceptable values are-1 0 1")
call mpp_error(FATAL, "diag_axit_init: Invalid direction. &
&The acceptable values are-1 0 1")
end select
end subroutine check_if_valid_direction

Expand Down
24 changes: 12 additions & 12 deletions diag_manager/fms_diag_field_object.F90
Original file line number Diff line number Diff line change
Expand Up @@ -383,18 +383,18 @@ subroutine fms_register_diag_field_obj &

if (present(area)) then
if (area < 0) call mpp_error("fms_register_diag_field_obj", &
"The area id passed with field_name"//trim(varname)//" has not been registered."&
"Check that there is a register_diag_field call for the AREA measure and that is in the"&
"diag_table.yaml", FATAL)
"The area id passed with field_name"//trim(varname)//" has not been registered. &
&Check that there is a register_diag_field call for the AREA measure and that is in the &
&diag_table.yaml", FATAL)
allocate(this%area)
this%area = area
endif

if (present(volume)) then
if (volume < 0) call mpp_error("fms_register_diag_field_obj", &
"The volume id passed with field_name"//trim(varname)//" has not been registered."&
"Check that there is a register_diag_field call for the VOLUME measure and that is in the"&
"diag_table.yaml", FATAL)
"The volume id passed with field_name"//trim(varname)//" has not been registered. &
&Check that there is a register_diag_field call for the VOLUME measure and that is in the &
&diag_table.yaml", FATAL)
allocate(this%volume)
this%volume = volume
endif
Expand Down Expand Up @@ -1610,19 +1610,19 @@ subroutine add_area_volume(this, area, volume)
if (area > 0) then
this%area = area
else
call mpp_error(FATAL, "diag_field_add_cell_measures: the area id is not valid. "&
&"Verify that the area_id passed in to the field:"//this%varname//&
&" is valid and that the field is registered and in the diag_table.yaml")
call mpp_error(FATAL, "diag_field_add_cell_measures: the area id is not valid. &
&Verify that the area_id passed in to the field:"//this%varname// &
" is valid and that the field is registered and in the diag_table.yaml")
endif
endif

if (present(volume)) then
if (volume > 0) then
this%volume = volume
else
call mpp_error(FATAL, "diag_field_add_cell_measures: the volume id is not valid. "&
&"Verify that the volume_id passed in to the field:"//this%varname//&
&" is valid and that the field is registered and in the diag_table.yaml")
call mpp_error(FATAL, "diag_field_add_cell_measures: the volume id is not valid. &
&Verify that the volume_id passed in to the field:"//this%varname// &
" is valid and that the field is registered and in the diag_table.yaml")
endif
endif

Expand Down
4 changes: 2 additions & 2 deletions diag_manager/fms_diag_file_object.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1018,8 +1018,8 @@ subroutine add_start_time(this, start_time)
!! this%start_time was already updated so make sure it is the same for the current variable
!! or error out
if (this%start_time .ne. start_time)&
call mpp_error(FATAL, "The variables associated with the file:"//this%get_file_fname()//" have"&
&" different start_time")
call mpp_error(FATAL, "The variables associated with the file:"//this%get_file_fname()//" have &
&different start_time")
else
!> If the this%start_time is equal to the diag_init_time,
!! simply update it with the start_time and set up the *_output variables
Expand Down
4 changes: 2 additions & 2 deletions diag_manager/fms_diag_input_buffer.F90
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ function allocate_input_buffer_object(this, input_data, axis_ids, diag_axis) &
allocate(integer(kind=i4_kind) :: this%buffer(length(1), length(2), length(3), length(4)))
this%buffer = 0_i8_kind
class default
err_msg = "The data input is not one of the supported types."&
"Only r4, r8, i4, and i8 types are supported."
err_msg = "The data input is not one of the supported types. &
&Only r4, r8, i4, and i8 types are supported."
end select

this%weight = 1.0_r8_kind
Expand Down
4 changes: 2 additions & 2 deletions diag_manager/fms_diag_object.F90
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,8 @@ FUNCTION fms_diag_axis_init(this, axis_name, axis_data, units, cart_name, axis_l
type is (fmsDiagFullAxis_type)
if(present(edges)) then
if (edges < 0 .or. edges > this%registered_axis) &
call mpp_error(FATAL, "diag_axit_init: The edge axis has not been defined. "&
"Call diag_axis_init for the edge axis first")
call mpp_error(FATAL, "diag_axit_init: The edge axis has not been defined. &
&Call diag_axis_init for the edge axis first")
select type (edges_axis => this%diag_axis(edges)%axis)
type is (fmsDiagFullAxis_type)
edges_name = edges_axis%get_axis_name()
Expand Down
4 changes: 2 additions & 2 deletions diag_manager/fms_diag_yaml.F90
Original file line number Diff line number Diff line change
Expand Up @@ -936,8 +936,8 @@ function set_valid_time_units(time_units, error_msg) &
time_units_int = DIAG_YEARS
case default
time_units_int =DIAG_NULL
call mpp_error(FATAL, trim(error_msg)//" is not valid. Acceptable values are "&
"seconds, minutes, hours, days, months, years")
call mpp_error(FATAL, trim(error_msg)//" is not valid. Acceptable values are &
&seconds, minutes, hours, days, months, years")
end select
end function set_valid_time_units

Expand Down
56 changes: 28 additions & 28 deletions fms2_io/netcdf_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,8 @@ subroutine netcdf_save_restart(fileobj, unlim_dim_level)
integer :: i

if (.not. fileobj%is_restart) then
call error("write_restart:: file "//trim(fileobj%path)//" is not a restart file."&
&" Be sure the file was opened with is_restart=.true.")
call error("write_restart:: file "//trim(fileobj%path)//" is not a restart file. &
&Be sure the file was opened with is_restart=.true.")
endif
do i = 1, fileobj%num_restart_vars
if (associated(fileobj%restart_vars(i)%data0d)) then
Expand Down Expand Up @@ -1132,8 +1132,8 @@ subroutine netcdf_restore_state(fileobj, unlim_dim_level)
integer :: i

if (.not. fileobj%is_restart) then
call error("read_restart:: file "//trim(fileobj%path)//" is not a restart file."&
&" Be sure the file was opened with is_restart=.true.")
call error("read_restart:: file "//trim(fileobj%path)//" is not a restart file. &
&Be sure the file was opened with is_restart=.true.")
endif
do i = 1, fileobj%num_restart_vars
if (associated(fileobj%restart_vars(i)%data0d)) then
Expand Down Expand Up @@ -1283,8 +1283,8 @@ subroutine get_dimension_names(fileobj, names, broadcast)
ndims = get_num_dimensions(fileobj, broadcast=.false.)
if (ndims .gt. 0) then
if (size(names) .ne. ndims) then
call error("'names' has to be the same size of the number of dimensions."&
&" Check your get_dimension_names call for file "//trim(fileobj%path))
call error("'names' has to be the same size of the number of dimensions. &
&Check your get_dimension_names call for file "//trim(fileobj%path))
endif
else
call error("get_dimension_names: the file "//trim(fileobj%path)//" does not have any dimensions")
Expand All @@ -1304,8 +1304,8 @@ subroutine get_dimension_names(fileobj, names, broadcast)
if (.not. fileobj%is_root) then
if (ndims .gt. 0) then
if (size(names) .ne. ndims) then
call error("'names' has to be the same size of the number of dimensions."&
&" Check your get_dimension_names call for file "//trim(fileobj%path))
call error("'names' has to be the same size of the number of dimensions. &
&Check your get_dimension_names call for file "//trim(fileobj%path))
endif
else
call error("get_dimension_names: the file "//trim(fileobj%path)//" does not have any dimensions")
Expand Down Expand Up @@ -1507,8 +1507,8 @@ subroutine get_variable_names(fileobj, names, broadcast)
nvars = get_num_variables(fileobj, broadcast=.false.)
if (nvars .gt. 0) then
if (size(names) .ne. nvars) then
call error("'names' has to be the same size of the number of variables."&
&" Check your get_variable_names call for file "//trim(fileobj%path))
call error("'names' has to be the same size of the number of variables. &
&Check your get_variable_names call for file "//trim(fileobj%path))
endif
else
call error("get_variable_names: the file "//trim(fileobj%path)//" does not have any variables")
Expand All @@ -1528,8 +1528,8 @@ subroutine get_variable_names(fileobj, names, broadcast)
if (.not. fileobj%is_root) then
if (nvars .gt. 0) then
if (size(names) .ne. nvars) then
call error("'names' has to be the same size of the number of variables."&
&" Check your get_variable_names call for file "//trim(fileobj%path))
call error("'names' has to be the same size of the number of variables. &
&Check your get_variable_names call for file "//trim(fileobj%path))
endif
else
call error("get_variable_names: the file "//trim(fileobj%path)//" does not have any variables")
Expand Down Expand Up @@ -1641,9 +1641,9 @@ subroutine get_variable_dimension_names(fileobj, variable_name, dim_names, &
call check_netcdf_code(err, append_error_msg)
if (ndims .gt. 0) then
if (size(dim_names) .ne. ndims) then
call error("'names' has to be the same size of the number of dimensions for the variable."&
&" Check your get_variable_dimension_names call for file "//trim(fileobj%path)//&
&" and variable:"//trim(variable_name))
call error("'names' has to be the same size of the number of dimensions for the variable. &
&Check your get_variable_dimension_names call for file "//trim(fileobj%path)// &
" and variable:"//trim(variable_name))
endif
else
call error("get_variable_dimension_names: the variable: "//trim(variable_name)//" in file: "//trim(fileobj%path)&
Expand All @@ -1664,9 +1664,9 @@ subroutine get_variable_dimension_names(fileobj, variable_name, dim_names, &
if (.not. fileobj%is_root) then
if (ndims .gt. 0) then
if (size(dim_names) .ne. ndims) then
call error("'names' has to be the same size of the number of dimensions for the variable."&
&" Check your get_variable_dimension_names call for file "//trim(fileobj%path)//&
&" and variable:"//trim(variable_name))
call error("'names' has to be the same size of the number of dimensions for the variable. &
& Check your get_variable_dimension_names call for file "//trim(fileobj%path)// &
" and variable:"//trim(variable_name))
endif
else
call error("get_variable_dimension_names: the variable: "//trim(variable_name)//" in file: "//trim(fileobj%path)&
Expand Down Expand Up @@ -1707,9 +1707,9 @@ subroutine get_variable_size(fileobj, variable_name, dim_sizes, broadcast)
call check_netcdf_code(err, append_error_msg)
if (ndims .gt. 0) then
if (size(dim_sizes) .ne. ndims) then
call error("'dim_sizes' has to be the same size of the number of dimensions for the variable."&
&" Check your get_variable_size call for file "//trim(fileobj%path)//&
&" and variable:"//trim(variable_name))
call error("'dim_sizes' has to be the same size of the number of dimensions for the variable. &
&Check your get_variable_size call for file "//trim(fileobj%path)// &
" and variable:"//trim(variable_name))
endif
else
call error("get_variable_size: the variable: "//trim(variable_name)//" in file: "//trim(fileobj%path)//&
Expand All @@ -1729,9 +1729,9 @@ subroutine get_variable_size(fileobj, variable_name, dim_sizes, broadcast)
if (.not. fileobj%is_root) then
if (ndims .gt. 0) then
if (size(dim_sizes) .ne. ndims) then
call error("'dim_sizes' has to be the same size of the number of dimensions for the variable."&
&" Check your get_variable_size call for file "//trim(fileobj%path)//&
&" and variable:"//trim(variable_name))
call error("'dim_sizes' has to be the same size of the number of dimensions for the variable. &
&Check your get_variable_size call for file "//trim(fileobj%path)// &
" and variable:"//trim(variable_name))
endif
else
call error("get_variable_size: the variable: "//trim(variable_name)//" in file: "//trim(fileobj%path)//&
Expand Down Expand Up @@ -2227,8 +2227,8 @@ function is_registered_to_restart(fileobj, variable_name) &
integer :: i

if (.not. fileobj%is_restart) then
call error("file "//trim(fileobj%path)//" is not a restart file. "&
//"Add is_restart=.true. to your open_file call")
call error("file "//trim(fileobj%path)//" is not a restart file. &
&Add is_restart=.true. to your open_file call")
endif
is_registered = .false.
do i = 1, fileobj%num_restart_vars
Expand Down Expand Up @@ -2320,8 +2320,8 @@ subroutine write_restart_bc(fileobj, unlim_dim_level)
integer :: i !< No description

if (.not. fileobj%is_restart) then
call error("file "//trim(fileobj%path)//" is not a restart file. "&
&"Add is_restart=.true. to your open_file call")
call error("file "//trim(fileobj%path)//" is not a restart file. &
&Add is_restart=.true. to your open_file call")
endif

!> Loop through the variables, root pe gathers the data from the other pes and writes out the checksum.
Expand Down
Loading