zhangyiss/gctl_potential
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tmp update

Browse Source
This commit is contained in:
张壹 2024-10-08 11:30:33 +08:00
parent 042d310021
commit 28f6e37527
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
example/CMakeLists.txt
View File

@ -12,14 +12,14 @@ macro(add_example name switch)
endif()
endmacro()
add_example(mobser_dipole_ex ON)
add_example(mobser_block_ex ON)
add_example(mobser_block_gradient_ex ON)
add_example(mobser_tri_ex ON)
add_example(mobser_tri_sph_ex ON)
add_example(mobser_tricone_ex ON)
add_example(mobser_tetra_ex ON)
add_example(mobser_tetra_ex2 ON)
add_example(mobser_tetra_sph_ex ON)
add_example(mobser_tesseroid_ex ON)
add_example(read_IGRF_ex ON)
add_example(mobser_dipole_ex OFF)
add_example(mobser_block_ex OFF)
add_example(mobser_block_gradient_ex OFF)
add_example(mobser_tri_ex OFF)
add_example(mobser_tri_sph_ex OFF)
add_example(mobser_tricone_ex OFF)
add_example(mobser_tetra_ex OFF)
add_example(mobser_tetra_ex2 OFF)
add_example(mobser_tetra_sph_ex OFF)
add_example(mobser_tesseroid_ex OFF)
add_example(read_IGRF_ex OFF)

32
tool/gridmanager-potential/gridmanager-potential.cpp
View File

@ -453,17 +453,21 @@ void data_cloud(const std::vector<std::string> &cmd_units)
else if (copy_str[1] == "cell") d_type = ElemData;
else throw std::runtime_error("open-surfer: invalid grid data type.");
std::string order_str = "0,1,2";
char delimiter = ' ';
char annotate = '#';
int head_record = 0;
text_descriptor desc;
desc.file_name_ = copy_str[2];
desc.file_ext_ = ".txt";
desc.col_str_ = "0,1,2";
desc.delimiter_ = ' ';
desc.att_sym_ = '#';
desc.head_num_ = 0;
if (copy_str[6] != "null")
{
parse_string_to_value(copy_str[6], '/', true, order_str, delimiter, annotate, head_record);
parse_string_to_value(copy_str[6], '/', true, desc.col_str_,
desc.delimiter_, desc.att_sym_, desc.head_num_);
}
std::vector<double> posix_vec, posiy_vec, data_vec;
read_text2vectors(copy_str[2], order_str, delimiter, annotate, head_record, posix_vec, posiy_vec, data_vec);
read_text2vectors(desc, posix_vec, posiy_vec, data_vec);
array<point2dc> posi_arr(posix_vec.size());
array<double> posi_val;
@ -717,16 +721,22 @@ void get_profile(const std::vector<std::string> &cmd_units)
}
else // File exist
{
std::string od_str = "0,1";
char deli = ' ', antot = '#';
int hr = 0;
text_descriptor desc;
desc.file_name_ = copy_str[2];
desc.file_ext_ = ".txt";
desc.att_sym_ = '#';
desc.col_str_ = "0,1";
desc.delimiter_ = ' ';
desc.head_num_ = 0;
if (copy_str[3] != "null")
{
gctl::parse_string_to_value(copy_str[3], '/', true, od_str, deli, antot, hr);
gctl::parse_string_to_value(copy_str[3], '/', true, desc.col_str_, desc.delimiter_,
desc.att_sym_, desc.head_num_);
}
std::vector<double> xs, ys;
gctl::read_text2vectors(copy_str[2], od_str, deli, antot, hr, xs, ys);
gctl::read_text2vectors(desc, xs, ys);
xys.resize(xs.size());
for (size_t i = 0; i < xys.size(); i++)