Skip to content

Commit cd904ef

Browse files
author
William Wolf
committed
Squash a few bugs for newer namelists.
1 parent d09217b commit cd904ef

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mesa_script/lib/mesa_script.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def self.add_kap_defaults(verbose: false)
171171
config_namelist(
172172
namelist: :kap,
173173
source_files: [File.join(ENV['MESA_DIR'], 'kap', 'private',
174-
"kap_ctrls_io.#{f_end}"),
174+
"kap_ctrls_io.#{f_end}")],
175175
defaults_file: File.join(ENV['MESA_DIR'], 'kap', 'defaults',
176176
'kap.defaults'),
177177
verbose: verbose
@@ -183,7 +183,7 @@ def self.add_eos_defaults(verbose: false)
183183
config_namelist(
184184
namelist: :eos,
185185
source_files: [File.join(ENV['MESA_DIR'], 'eos', 'private',
186-
"eos_ctrls_io.#{f_end}"),
186+
"eos_ctrls_io.#{f_end}")],
187187
defaults_file: File.join(ENV['MESA_DIR'], 'eos', 'defaults',
188188
'eos.defaults'),
189189
verbose: verbose
@@ -690,14 +690,15 @@ def self.get_names_and_types(namelist)
690690
line.split('::').map(&:strip)
691691
end
692692
pairs.each do |pair|
693+
next if pair[0] == 'public'
693694
type = case pair[0]
694695
when /logical/ then :bool
695696
when /character/ then :string
696697
when /real/ then :float
697698
when /integer/ then :int
698699
when /type/ then :type
699700
else
700-
raise "Couldn't determine type of entry #{pair[0]} in " \
701+
raise "Couldn't determine type of entry \"#{pair[0]}\" in " \
701702
"#{source_file}."
702703
end
703704
name_chars = pair[1].split('')

0 commit comments

Comments
 (0)