Relion/qsub

--- relion-3.0_beta/src/gui_jobwindow.cpp.orig	2018-08-03 00:42:30.661198915 +0900
+++ relion-3.0_beta/src/gui_jobwindow.cpp	2018-08-03 20:45:29.884243395 +0900
@@ -218,6 +218,7 @@
 
 	if (myjob.joboptions.find("nr_mpi") != myjob.joboptions.end())
 	{
+		if (myjob.joboptions.find("nr_nodes") != myjob.joboptions.end()) place("nr_nodes", TOGGLE_LEAVE_ACTIVE);
 		place("nr_mpi", TOGGLE_LEAVE_ACTIVE);
 		has_parallel = true;
 	}
@@ -259,11 +260,6 @@
 
 	place("qsubscript");
 
-	place("min_dedicated");
-	if (do_allow_change_minimum_dedicated)
-		guientries["min_dedicated"].deactivate(false);
-	else
-		guientries["min_dedicated"].deactivate(true);
 
 	queue_group->end();
 	guientries["do_queue"].cb_menu_i(); // This is to make the default effective

--- relion-3.0_beta/src/pipeline_jobs.cpp.orig  2018-08-07 18:29:26.193434987 +0900
+++ relion-3.0_beta/src/pipeline_jobs.cpp       2018-08-07 19:12:01.347371365 +0900
@@ -443,25 +443,18 @@
                int nmpi = (joboptions.find("nr_mpi") != joboptions.end()) ? joboptions["nr_mpi"(略
                int nthr = (joboptions.find("nr_threads") != joboptions.end()) ? joboptions["nr_(略
                int ncores = nmpi * nthr;
-               int ndedi = joboptions["min_dedicated"].getNumber();
-               float fnodes = (float)ncores / (float)ndedi;
-               int nnodes = CEIL(fnodes);
-               if (fmod(fnodes, 1) > 0)
-               {
-                       std:: cout << std::endl;
-                       std::cout << " Warning! You're using " << nmpi << " MPI processes with(略
-                       std::cout << " It is more efficient to make the number of cores (i.e. (略
-               }
 
                fh.clear(); // reset eof if happened...
                fh.seekg(0, std::ios::beg);
                std::string line;
                std::map<std::string, std::string> replacing;
+               replacing["XXXversionXXX"] = RELION_VERSION;
+               replacing["XXXsumXXX"] = floatToString( joboptions["nr_nodes"].getNumber() * ncores );
+               replacing["XXXmpiprocXXX"] = floatToString( joboptions["nr_nodes"].getNumber() * nmpi );
                replacing["XXXmpinodesXXX"] = floatToString(nmpi);
                replacing["XXXthreadsXXX"] = floatToString(nthr);
                replacing["XXXcoresXXX"] = floatToString(ncores);
-               replacing["XXXdedicatedXXX"] = floatToString(ndedi);
-               replacing["XXXnodesXXX"] = floatToString(nnodes);
+               replacing["XXXnodesXXX"] = floatToString( joboptions["nr_nodes"].getNumber() );
                replacing["XXXnameXXX"] = outputname;
                replacing["XXXerrfileXXX"] = outputname + "run.err";
                replacing["XXXoutfileXXX"] = outputname + "run.out";
@@ -757,7 +750,8 @@
        const char qsub_nrmpi_val = (qsub_nrmpi_text ? atoi(qsub_nrmpi_text) : DEFAULTNRMPI);
        if (has_mpi)
        {
-               joboptions["nr_mpi"] = JobOption("Number of MPI procs:", qsub_nrmpi_val , 1, (略
+               joboptions["nr_nodes"] = JobOption("Number of nodes:", 1, 1, 8 , 1, "Number (略
+               joboptions["nr_mpi"] = JobOption("Number of MPI procs per nodes:", qsub_nrm(略
        }
 
        const char *thread_max_input = getenv("RELION_THREAD_MAX");
@@ -837,11 +831,12 @@
 In the template script a number of variables will be replaced: \n \
 XXXcommandXXX = relion command + arguments; \n \
 XXXqueueXXX = The queue name; \n \
-XXXmpinodesXXX = The number of MPI nodes; \n \
-XXXthreadsXXX = The number of threads; \n \
+XXXmpinodesXXX = The number of MPI per node; \n \
+XXXmpiprocXXX = The total number of MPI; \n \
+XXXthreadsXXX = The number of threads per MPI; \n \
 XXXcoresXXX = XXXmpinodesXXX * XXXthreadsXXX; \n \
-XXXdedicatedXXX = The minimum number of dedicated cores on each node; \n \
-XXXnodesXXX = The number of requested nodes = CEIL(XXXcoresXXX / XXXdedicatedXXX); \n \
+XXXsumXXX = The total number of core; \n \
+XXXnodesXXX = The number of requested nodes \n \
 If these options are not enough for your standard jobs, you may define a user-specifie(略
 The number of extra variables is controlled through the environment variable RELION_QS(略
 Their help text is set by the environment variables RELION_QSUB_EXTRA1, RELION_QSUB_EX(略
@@ -851,9 +846,6 @@
 But note that (unlike all other entries in the GUI) the extra values are not rememb(略
 
        // Check for environment variable RELION_QSUB_TEMPLATE
-       char * my_minimum_dedicated = getenv ("RELION_MINIMUM_DEDICATED");
-       int minimum_nr_dedicated = (my_minimum_dedicated == NULL) ? DEFAULTMININIMUMD(略
-       joboptions["min_dedicated"] = JobOption("Minimum dedicated cores per node:", (略
 
        // Need the std::string(), as otherwise it will be overloaded and passed as a boolean....
        joboptions["other_args"] = JobOption("Additional arguments:", std::string(""), (略

--- ./relion-3.0_beta/src/pipeline_jobs.h.orig  2018-08-03 00:42:30.809196808 +0900
+++ ./relion-3.0_beta/src/pipeline_jobs.h       2018-08-07 02:41:58.233612539 +0900
@@ -51,13 +51,13 @@
 #define RADIO_GAIN_FLIP 3
 
 // Our own defaults at LMB are the hard-coded ones
-#define DEFAULTQSUBLOCATION "/public/EM/RELION/relion/bin/relion_qsub.csh"
-#define DEFAULTCTFFINDLOCATION "/public/EM/ctffind/ctffind.exe"
-#define DEFAULTMOTIONCOR2LOCATION "/public/EM/MOTIONCOR2/MotionCor2"
-#define DEFAULTUNBLURLOCATION "/public/EM/UNBLUR/unblur.exe"
-#define DEFAULTSUMMOVIELOCATION "/public/EM/SUMMOVIE/summovie.exe"
-#define DEFAULTGCTFLOCATION "/public/EM/Gctf/bin/Gctf"
-#define DEFAULTRESMAPLOCATION "/public/EM/ResMap/ResMap-1.1.4-linux64"
+#define DEFAULTQSUBLOCATION "/Appl/relion/bin/qsub.sh"
+#define DEFAULTCTFFINDLOCATION "/Appl/ctf/ctffind4.exe"
+#define DEFAULTMOTIONCOR2LOCATION "/Appl/local/bin/MotionCor2"
+#define DEFAULTUNBLURLOCATION "/Appl/local/bin/unblur"
+#define DEFAULTSUMMOVIELOCATION "/Appl/local/bin/summovie"
+#define DEFAULTGCTFLOCATION "/Appl/Gctf/bin/gctf"
+#define DEFAULTRESMAPLOCATION "/Appl/local/bin/ResMap"
 #define DEFAULTQSUBCOMMAND "qsub"
 #define DEFAULTQUEUENAME "openmpi"
 #define DEFAULTMININIMUMDEDICATED 1

--- relion-3.0_beta/src/apps/maingui.cpp.prog   2018-08-02 15:17:56.410396004 +0900
+++ relion-3.0_beta/src/apps/maingui.cpp        2018-08-05 00:42:17.070339083 +0900
@@ -65,7 +65,7 @@
 #ifdef PACKAGE_VERSION
         strcat(titletext,PACKAGE_VERSION);
 #endif
-        strcat(titletext,": ");
+        strcat(titletext,": 180805, cuda-9.2 :");
 
        strcat (titletext, short_dir);