Skip to content

Commit 9b59c93

Browse files
committed
Simplify parsing nodes
1 parent c2723ff commit 9b59c93

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

src/Create_EXIT89_Data_File.f90

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ program Create_EXIT89_Data_File
4343
integer :: computed_arcs_value_1, computed_arcs_value_5
4444
real :: computed_arcs_value_2, computed_arcs_value_3, computed_arcs_value_4
4545

46+
! Compute intermediate values for parsing nodes
47+
integer :: computed_nodes_value_1, computed_nodes_value_2, computed_nodes_value_4
48+
integer :: computed_nodes_value_5, computed_nodes_value_6, computed_nodes_value_7
49+
real :: computed_nodes_value_3, computed_nodes_value_8
50+
4651
! Operation titles array
4752
character(29), parameter, dimension(9) :: OP_TITLES = [ &
4853
"UNITS (1-METRIC,2-STD) =", &
@@ -60,7 +65,7 @@ program Create_EXIT89_Data_File
6065
! Read in spreadsheet that specifies the arcs and nodes
6166
! File names and units
6267
character(*), parameter :: INPUT_FILE = '../data/EXIT89.csv'
63-
character(*), parameter :: OUTPUT_FILE = 'exit89.dat'
68+
character(*), parameter :: OUTPUT_FILE = 'EXIT89.dat'
6469
integer, parameter :: INPUT_UNIT = 8
6570
integer, parameter :: OUTPUT_UNIT = 9
6671

@@ -187,11 +192,25 @@ program Create_EXIT89_Data_File
187192
else if (its_nodes) then
188193
if (no_separator_yet) write (OUTPUT_UNIT, 120) '99999 0.0 0.0 0.0 000'
189194
no_separator_yet = .false.
190-
write (OUTPUT_UNIT, 110) int(rarray(ir_set, data_columns(1))) - ibase + i_floor*100, &
191-
int(rarray(ir_set, data_columns(2))), &
192-
rarray(ir_set, data_columns(3)), &
193-
(int(rarray(ir_set, data_columns(ic))), ic=4, 7), &
194-
rarray(ir_set, data_columns(8))
195+
! Define computed values
196+
computed_nodes_value_1 = int(rarray(ir_set, data_columns(1))) - ibase + i_floor * 100
197+
computed_nodes_value_2 = int(rarray(ir_set, data_columns(2)))
198+
computed_nodes_value_3 = rarray(ir_set, data_columns(3))
199+
computed_nodes_value_4 = int(rarray(ir_set, data_columns(4)))
200+
computed_nodes_value_5 = int(rarray(ir_set, data_columns(5)))
201+
computed_nodes_value_6 = int(rarray(ir_set, data_columns(6)))
202+
computed_nodes_value_7 = int(rarray(ir_set, data_columns(7)))
203+
computed_nodes_value_8 = rarray(ir_set, data_columns(8))
204+
! Write the values to the output
205+
write(OUTPUT_UNIT, 110) computed_nodes_value_1, computed_nodes_value_2, computed_nodes_value_3, &
206+
computed_nodes_value_4, computed_nodes_value_5, computed_nodes_value_6, &
207+
computed_nodes_value_7, computed_nodes_value_8
208+
209+
! write (OUTPUT_UNIT, 110) int(rarray(ir_set, data_columns(1))) - ibase + i_floor*100, &
210+
! int(rarray(ir_set, data_columns(2))), &
211+
! rarray(ir_set, data_columns(3)), &
212+
! (int(rarray(ir_set, data_columns(ic))), ic=4, 7), &
213+
! rarray(ir_set, data_columns(8))
195214
end if
196215
end do
197216
end do

0 commit comments

Comments
 (0)