diff --git a/packages/sbatch-tui/src/fdtd.cpp b/packages/sbatch-tui/src/fdtd.cpp index 435924bb..7abea006 100644 --- a/packages/sbatch-tui/src/fdtd.cpp +++ b/packages/sbatch-tui/src/fdtd.cpp @@ -13,7 +13,7 @@ namespace sbatch std::string Cpus = "1"; bool Nomultithread = true; int MemorySchemeSelected = 0; - std::vector MemorySchemeEntries = { "Default", "All", "Custom" }; + std::vector MemorySchemeEntries = { "Default", "Custom" }; std::string Memory = "1"; std::string InputFile = "input.fsp"; }; @@ -75,7 +75,7 @@ namespace sbatch ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected), input(&State_.Memory, "Memory (GB): ") | with_list_padding | with_separator - | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; }) + | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; }) }) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator }) | with_title("Resource allocation:") | with_bottom, // 第三行:输入文件 @@ -97,8 +97,7 @@ namespace sbatch auto mem_string = [&] { if (State_.MemorySchemeSelected == 0) return recommended.Memory ? "--mem={}G"_f(*recommended.Memory) : ""; - else if (State_.MemorySchemeSelected == 1) return "--mem=0"s; - else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory); + else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory); else std::unreachable(); }(); return diff --git a/packages/sbatch-tui/src/mumax3.cpp b/packages/sbatch-tui/src/mumax3.cpp index 35172039..d2d06394 100644 --- a/packages/sbatch-tui/src/mumax3.cpp +++ b/packages/sbatch-tui/src/mumax3.cpp @@ -14,7 +14,7 @@ namespace sbatch std::vector> GpuEntries; bool Nomultithread = true; int MemorySchemeSelected = 0; - std::vector MemorySchemeEntries = { "Default", "All", "Custom" }; + std::vector MemorySchemeEntries = { "Default", "Custom" }; std::string Memory = "1"; std::string InputFile = "input.txt"; }; @@ -83,7 +83,7 @@ namespace sbatch ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected), input(&State_.Memory, "Memory (GB): ") | with_list_padding | with_separator - | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; }) + | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; }) }) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator }) | with_title("Resource allocation:") | with_bottom, // 第三行:任务名和输入输出文件 @@ -105,8 +105,7 @@ namespace sbatch auto mem_string = [&] { if (State_.MemorySchemeSelected == 0) return "--mem=32G"s; - else if (State_.MemorySchemeSelected == 1) return "--mem=0"s; - else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory); + else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory); else std::unreachable(); }(); return diff --git a/packages/sbatch-tui/src/vasp_cpu.cpp b/packages/sbatch-tui/src/vasp_cpu.cpp index aac90e57..575b098f 100644 --- a/packages/sbatch-tui/src/vasp_cpu.cpp +++ b/packages/sbatch-tui/src/vasp_cpu.cpp @@ -16,7 +16,7 @@ namespace sbatch std::string OpenmpThreads = "1"; bool Nomultithread = true; int MemorySchemeSelected = 0; - std::vector MemorySchemeEntries = { "Default", "All", "Custom" }; + std::vector MemorySchemeEntries = { "Default", "Custom" }; std::string Memory = "1"; bool OptcellEnable = false; int OptcellSelected = 0; @@ -88,7 +88,7 @@ namespace sbatch ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected), input(&State_.Memory, "Memory (GB): ") | with_list_padding | with_separator - | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; }) + | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; }) }) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator }) | with_title("Resource allocation:") | with_bottom, // 第三行:任务名和输出文件 @@ -127,8 +127,7 @@ namespace sbatch auto mem_string = [&] { if (State_.MemorySchemeSelected == 0) return recommended.Memory ? "--mem={}G"_f(*recommended.Memory) : ""; - else if (State_.MemorySchemeSelected == 1) return "--mem=0"s; - else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory); + else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory); else std::unreachable(); }(); auto srun_string = [&] diff --git a/packages/sbatch-tui/src/vasp_gpu.cpp b/packages/sbatch-tui/src/vasp_gpu.cpp index 822e555b..dd7711ef 100644 --- a/packages/sbatch-tui/src/vasp_gpu.cpp +++ b/packages/sbatch-tui/src/vasp_gpu.cpp @@ -19,7 +19,7 @@ namespace sbatch std::string OpenmpThreads = "1"; bool Nomultithread = true; int MemorySchemeSelected = 0; - std::vector MemorySchemeEntries = { "Default", "All", "Custom" }; + std::vector MemorySchemeEntries = { "Default", "Custom" }; std::string Memory = "1"; bool OptcellEnable = false; int OptcellSelected = 0; @@ -108,7 +108,7 @@ namespace sbatch ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected), input(&State_.Memory, "Memory (GB): ") | with_list_padding | with_separator - | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; }) + | ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; }) }) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator }) | with_title("Resource allocation:") | with_bottom, // 第三行:任务名和输出文件 @@ -150,8 +150,7 @@ namespace sbatch auto mem_string = [&] { if (State_.MemorySchemeSelected == 0) return "--mem=32G"s; - else if (State_.MemorySchemeSelected == 1) return "--mem=0"s; - else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory); + else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory); else std::unreachable(); }(); return