From b32329c920523dcd2a246b190d2deeed7a4271ab Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 16 Jun 2024 09:29:47 +0200 Subject: [PATCH] OASIS reader: avoiding slight rounding of DBU In python read/write cycle (discussion-2526) --- src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc | 4 +--- src/plugins/streamers/oasis/db_plugin/dbOASISReader.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc index a5f63ce65..04e312470 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc @@ -42,7 +42,6 @@ namespace db OASISReader::OASISReader (tl::InputStream &s) : m_stream (s), m_progress (tl::to_string (tr ("Reading OASIS file")), 10000), - m_dbu (0.001), m_expect_strict_mode (-1), mm_repetition (this, "repetition"), mm_placement_cell (this, "placement-cell"), @@ -648,8 +647,7 @@ OASISReader::do_read (db::Layout &layout) } // compute database unit in pixel per meter - m_dbu = 1.0e-6 / res; - layout.dbu (m_dbu * 1e6); + layout.dbu (1.0 / res); // read over table offsets if required bool table_offsets_at_end = get_uint (); diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h index 68a60f844..6d381983b 100644 --- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h +++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h @@ -124,7 +124,6 @@ private: tl::InputStream &m_stream; tl::AbsoluteProgress m_progress; std::string m_cellname; - double m_dbu; int m_expect_strict_mode; size_t m_first_cellname; size_t m_first_propname;