Skip to content

Commit 256b478

Browse files
committed
EAMxx: simplify handling of geo data in CoarserningRemapper
1 parent 15b3e55 commit 256b478

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

components/eamxx/src/share/grid/remap/coarsening_remapper.cpp

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,7 @@ CoarseningRemapper (const grid_ptr_type& src_grid,
3434
continue;
3535
}
3636
const auto& src_data = src_grid->get_geometry_data(name);
37-
const auto& src_data_fid = src_data.get_header().get_identifier();
38-
const auto& layout = src_data_fid.get_layout();
39-
if (layout.tags().empty()) {
40-
// This is a scalar field, so won't be coarsened.
41-
// Simply copy it in the tgt grid, but we still need to assign the new grid name.
42-
FieldIdentifier tgt_data_fid(src_data_fid.name(),src_data_fid.get_layout(),src_data_fid.get_units(),m_tgt_grid->name());
43-
auto tgt_data = m_coarse_grid->create_geometry_data(tgt_data_fid);
44-
tgt_data.deep_copy(src_data);
45-
} else if (layout.tags()[0]!=COL) {
46-
// Not a field to be coarsened (perhaps a vertical coordinate field).
47-
// Simply copy it in the tgt grid, but we still need to assign the new grid name.
48-
FieldIdentifier tgt_data_fid(src_data_fid.name(),src_data_fid.get_layout(),src_data_fid.get_units(),m_tgt_grid->name());
49-
auto tgt_data = m_coarse_grid->create_geometry_data(tgt_data_fid);
50-
tgt_data.deep_copy(src_data);
51-
} else {
52-
// This field needs to be remapped
53-
auto tgt_data_fid = create_tgt_fid(src_data_fid);
54-
auto tgt_data = m_coarse_grid->create_geometry_data(tgt_data_fid);
55-
register_field(src_data,tgt_data);
56-
}
37+
register_field_from_src(src_data);
5738
}
5839
registration_ends();
5940
if (get_num_fields()>0) {

0 commit comments

Comments
 (0)