@@ -538,10 +538,36 @@ def test_input_comments(self):
538
538
self .assertDictEqual (
539
539
d ,
540
540
{
541
- 'Gradient 1' : ParameterEntry (Name = 'Gradient 1' , sValue = '69' , Comment = '' ),
542
- 'Reservoir Depth' : ParameterEntry (Name = 'Reservoir Depth' , sValue = '5' , Comment = '-- comment here' ),
543
- 'End-Use Option' : ParameterEntry (Name = 'End-Use Option' , sValue = '1' , Comment = '# another comment' ),
544
- 'Power Plant Type' : ParameterEntry (Name = 'Power Plant Type' , sValue = '4' , Comment = 'comments galore' ),
541
+ 'Gradient 1' : ParameterEntry (Name = 'Gradient 1' , sValue = '69' , Comment = '' , raw_entry = 'Gradient 1, 69' ),
542
+ 'Reservoir Depth' : ParameterEntry (
543
+ Name = 'Reservoir Depth' ,
544
+ sValue = '5' ,
545
+ Comment = '-- comment here' ,
546
+ raw_entry = 'Reservoir Depth, 5, -- comment here' ,
547
+ ),
548
+ 'End-Use Option' : ParameterEntry (
549
+ Name = 'End-Use Option' ,
550
+ sValue = '1' ,
551
+ Comment = '# another comment' ,
552
+ raw_entry = 'End-Use Option, 1, # another comment' ,
553
+ ),
554
+ 'Power Plant Type' : ParameterEntry (
555
+ Name = 'Power Plant Type' ,
556
+ sValue = '4' ,
557
+ Comment = 'comments galore' ,
558
+ raw_entry = 'Power Plant Type, 4, comments galore' ,
559
+ ),
560
+ # Note sValue and Comment are, obviously, inaccurate for list-type parameters - this is handled in
561
+ # geophires_x.Parameter.ReadParameter where raw_entry value is parsed instead.
562
+ 'Gradients' : ParameterEntry (
563
+ Name = 'Gradients' ,
564
+ sValue = '10' ,
565
+ Comment = ' 20 30 40 -- gradiance' ,
566
+ raw_entry = 'Gradients, 10, 20, 30, 40, -- gradiance' ,
567
+ ),
568
+ 'Thicknesses' : ParameterEntry (
569
+ Name = 'Thicknesses' , sValue = '3' , Comment = '2 1' , raw_entry = 'Thicknesses, 3,2, 1'
570
+ ),
545
571
},
546
572
)
547
573
0 commit comments