From 693e4ef3ff32015108d9519d388dbcbf2aa7dd5b Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Sun, 24 Jul 2022 07:41:22 +0800 Subject: [PATCH] update main --- config.sh | 17 +++++++++++++++++ src/main.cpp | 4 ++++ 2 files changed, 21 insertions(+) create mode 100755 config.sh diff --git a/config.sh b/config.sh new file mode 100755 index 0000000..dc1af89 --- /dev/null +++ b/config.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +cmd=${1} +package=gm3d +address=/opt/stow +taress=/usr/local + +if [[ ${cmd} == "configure" && ! -d "build/" ]]; then + mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${package} -DCMAKE_BUILD_TYPE=Release +elif [[ ${cmd} == "configure" ]]; then + cd build && rm -rf * && cmake .. -DCMAKE_INSTALL_PREFIX=${address}/${package} -DCMAKE_BUILD_TYPE=Release +elif [[ ${cmd} == "build" ]]; then + cd build && make +elif [[ ${cmd} == "install" ]]; then + cd build && sudo make install + sudo stow --dir=${address} --target=${taress} ${package} +fi \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index bd30812..52719b0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,6 +61,10 @@ DeltaT, DeltaTx, DeltaTy, DeltaTz, Hax, Hay and Za for magnetic data.", { gm3d_instance.BuildRegularGrid(dimension.c_str()); if (modelname != "NULL") gm3d_instance.AddModels(modelname.c_str()); + else + { + GCTL_ShowWhatError("No model parameters is found.", GCTL_WARNING_ERROR, 0, 0, 0); + } gm3d_instance.RegisteredOuput(remove_null); gm3d_instance.OutMshFile(out_mshname.c_str(), elename); }