Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Development v1.2 #2

Merged
merged 22 commits into from
Jun 29, 2021
Merged

Development v1.2 #2

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8128564
Adding CSV handling routines
jchristopherson Mar 10, 2021
d49c9b4
Adding CSV support
jchristopherson Mar 19, 2021
6ad7eb7
Work in progress for a linked list type
jchristopherson Mar 19, 2021
6f75e5e
Added linked_list routines and tests
jchristopherson May 25, 2021
1ce16a4
Add more linked_list functionallity and tests
jchristopherson May 26, 2021
de6843d
Update build script
jchristopherson May 26, 2021
e1f568d
Fix error handling messages
jchristopherson May 26, 2021
9311c16
Remove csv prototype codes
jchristopherson May 26, 2021
6a4f77c
add comments
jchristopherson May 26, 2021
45a4855
Add additional error flag constants
jchristopherson May 27, 2021
e8bb477
Add data_table type
jchristopherson May 27, 2021
094b685
Add more data_table routines
jchristopherson May 27, 2021
104e91e
Add data_table functionallity
jchristopherson May 27, 2021
82338ab
Add more data_table functionallity
jchristopherson May 28, 2021
8652031
Add error flags
jchristopherson Jun 1, 2021
e5d1b4d
Add more data_table functionallity
jchristopherson Jun 1, 2021
18d7be1
Update data_table class
jchristopherson Jun 1, 2021
0deb628
Update documentation
jchristopherson Jun 15, 2021
7f3bae0
Update comments
jchristopherson Jun 15, 2021
4674fed
Update documentation
jchristopherson Jun 15, 2021
4cb6efd
Update comments
jchristopherson Jun 29, 2021
5810881
bug fix on string splitting routine
jchristopherson Jun 29, 2021
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
Prev Previous commit
Next Next commit
Fix error handling messages
  • Loading branch information
@jchristopherson
jchristopherson committed May 26, 2021
commit e1f568dd485a601bb578647c4138a78053c90d05
36 changes: 18 additions & 18 deletions src/csv_column.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module function cc_get_string_item(this, index, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but a request for " // &
"This column holds string data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_string_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -131,7 +131,7 @@ module function cc_get_numeric_item(this, index, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but a request for " // &
"This column holds numeric data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_numeric_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -177,7 +177,7 @@ module function cc_get_logical_item(this, index, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but a request for " // &
"This column holds logical data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_logical_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -221,7 +221,7 @@ module subroutine cc_set_string_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but " // &
"This column holds string data, but " // &
get_data_type_name(x) // " was supplied."
call errmgr%report_error("cc_set_string_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -261,7 +261,7 @@ module subroutine cc_set_numeric_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but " // &
"This column holds numeric data, but " // &
get_data_type_name(x) // " was supplied."
call errmgr%report_error("cc_set_numeric_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -301,7 +301,7 @@ module subroutine cc_set_logical_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but " // &
"This column holds logical data, but " // &
get_data_type_name(x) // " was supplied."
call errmgr%report_error("cc_set_logical_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -343,7 +343,7 @@ module function cc_get_string_array(this, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but a request for " // &
"This column holds string data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_string_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -394,7 +394,7 @@ module function cc_get_numeric_array(this, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but a request for " // &
"This column holds numeric data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_numeric_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -443,7 +443,7 @@ module function cc_get_logical_array(this, id, err) result(rst)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but a request for " // &
"This column holds logical data, but a request for " // &
get_data_type_name(id) // " was made."
call errmgr%report_error("cc_get_logical_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -490,7 +490,7 @@ module subroutine cc_set_string_array(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but a request for " // &
"This column holds string data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_set_string_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -532,7 +532,7 @@ module subroutine cc_set_numeric_array(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but a request for " // &
"This column holds numeric data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_set_numeric_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -574,7 +574,7 @@ module subroutine cc_set_logical_array(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but a request for " // &
"This column holds logical data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_set_logical_array", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -616,7 +616,7 @@ module subroutine cc_insert_string_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but a request for " // &
"This column holds string data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_insert_string_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -657,7 +657,7 @@ module subroutine cc_insert_numeric_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but a request for " // &
"This column holds numeric data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_insert_numeric_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -698,7 +698,7 @@ module subroutine cc_insert_logical_item(this, index, x, err)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but a request for " // &
"This column holds logical data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_insert_logical_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -738,7 +738,7 @@ module subroutine cc_append_string_item(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_STRING_DATA) then
write (errmsg, '(A)') &
"This data holds string data, but a request for " // &
"This column holds string data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_append_string_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -772,7 +772,7 @@ module subroutine cc_append_numeric_item(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_NUMERIC_DATA) then
write (errmsg, '(A)') &
"This data holds numeric data, but a request for " // &
"This column holds numeric data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_append_numeric_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down Expand Up @@ -806,7 +806,7 @@ module subroutine cc_append_logical_item(this, x, err)
! Input Checking
if (this%get_data_type() /= CSV_LOGICAL_DATA) then
write (errmsg, '(A)') &
"This data holds logical data, but a request for " // &
"This column holds logical data, but a request for " // &
get_data_type_name(x) // " was made."
call errmgr%report_error("cc_append_logical_item", &
trim(errmsg), FCORE_DATA_TYPE_ERROR)
Expand Down