From ab541ac981b8be01a28f0d10397e554632b3c530 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 19 Jul 2021 11:52:07 +0800 Subject: [PATCH] update src --- src/magtet.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/magtet.cpp b/src/magtet.cpp index e9afe2f..9fd4624 100644 --- a/src/magtet.cpp +++ b/src/magtet.cpp @@ -48,28 +48,10 @@ void magtet::init_site(std::string para) double xmin, xmax, ymin, ymax, z; int xsize, ysize; gctl::utility::parse_string_to_value(para, '/', xmin, xmax, ymin, ymax, z, xsize, ysize); + gctl::gridspace(gctl::point3dc(xmin, 0.0, 0.5*z), gctl::point3dc(xmax, 0.0, 0.5*z), + gctl::point3dc(0.0, ymin, 0.5*z), gctl::point3dc(0.0, ymax, 0.5*z), xsize, ysize, site_); - if (xsize <= 0 || ysize <= 0) - { - throw gctl::invalid_argument("Invalid site size. From magtet::init_site(...)"); - } - - std::vector xs, ys; - gctl::linespace(xmin, xmax, xsize, xs); - gctl::linespace(ymin, ymax, ysize, ys); - - site_num_ = xsize*ysize; - site_.resize(site_num_); - for (int i = 0; i < ysize; ++i) - { - for (int j = 0; j < xsize; ++j) - { - site_[i*xsize + j].set(xs[j], ys[i], z); - } - } - - gctl::destroy_vector(xs); - gctl::destroy_vector(ys); + site_num_ = site_.size(); return; }