@@ -82,20 +82,7 @@ init (const ekat::ParameterList& params,
8282 " Error! Input class was already inited.\n " );
8383
8484 m_params = params;
85-
86- // Get field specifications and process aliases
87- std::vector<std::string> field_specs = m_params.get <decltype (field_specs)>(" field_names" );
88- auto [alias_to_field_map, alias_names] = process_field_aliases (field_specs);
89- m_alias_to_field_map = alias_to_field_map;
90- m_alias_names = alias_names;
91-
92- // Extract internal field names for field manager operations
93- m_fields_names.clear ();
94- for (const auto & spec : field_specs) {
95- auto [alias, field_name] = parse_field_alias (spec);
96- m_fields_names.push_back (field_name);
97- }
98-
85+ m_fields_names = m_params.get <decltype (m_fields_names)>(" field_names" );
9986 m_filename = m_params.get <std::string>(" filename" );
10087
10188 // Sets the internal field mgr, and possibly sets up the remapper
@@ -212,38 +199,35 @@ void AtmosphereInput::read_variables (const int time_index)
212199 if (m_atm_logger) {
213200 m_atm_logger->info (" [EAMxx::scorpio_input] Reading variables from file" );
214201 m_atm_logger->info (" file name: " + m_filename);
215- m_atm_logger->info (" var names: " + ekat::join (m_alias_names ," , " ));
202+ m_atm_logger->info (" var names: " + ekat::join (m_fields_names ," , " ));
216203 if (time_index!=-1 ) {
217204 m_atm_logger->info (" time idx : " + std::to_string (time_index));
218205 }
219206 }
220207 EKAT_REQUIRE_MSG (m_fields_inited and m_scorpio_inited,
221208 " Error! Internal structures not fully inited yet. Did you forget to call 'init(..)'?\n " );
222209
223- for (size_t i = 0 ; i < m_fields_names.size (); ++i) {
224- const auto & field_name = m_fields_names[i];
225- const auto & alias_name = m_alias_names[i];
210+ for (auto const & name : m_fields_names) {
226211
227- auto f_scorpio = m_fm_for_scorpio->get_field (field_name );
228- auto f_user = m_fm_from_user->get_field (field_name );
212+ auto f_scorpio = m_fm_for_scorpio->get_field (name );
213+ auto f_user = m_fm_from_user->get_field (name );
229214
230- // Read the data using alias name for netcdf variable
215+ // Read the data
231216 switch (f_scorpio.data_type ()) {
232217 case DataType::DoubleType:
233- scorpio::read_var (m_filename,alias_name ,f_scorpio.get_internal_view_data <double ,Host>(),time_index);
218+ scorpio::read_var (m_filename,name ,f_scorpio.get_internal_view_data <double ,Host>(),time_index);
234219 break ;
235220 case DataType::FloatType:
236- scorpio::read_var (m_filename,alias_name ,f_scorpio.get_internal_view_data <float ,Host>(),time_index);
221+ scorpio::read_var (m_filename,name ,f_scorpio.get_internal_view_data <float ,Host>(),time_index);
237222 break ;
238223 case DataType::IntType:
239- scorpio::read_var (m_filename,alias_name ,f_scorpio.get_internal_view_data <int ,Host>(),time_index);
224+ scorpio::read_var (m_filename,name ,f_scorpio.get_internal_view_data <int ,Host>(),time_index);
240225 break ;
241226 default :
242227 EKAT_ERROR_MSG (
243228 " Error! Unsupported/unrecognized data type while reading field from file.\n "
244229 " - file name : " + m_filename + " \n "
245- " - field name: " + field_name + " \n "
246- " - alias name: " + alias_name + " \n " );
230+ " - field name: " + name + " \n " );
247231 }
248232
249233 f_scorpio.sync_to_dev ();
0 commit comments