Sfoglia il codice sorgente

瓦斯爆炸修改

huangxingxing 8 mesi fa
parent
commit
255a9a5f02

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -381,6 +381,7 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 						TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water/runWater.sh" +
 						":/home/disaster/zhty/Water/runWater.sh " +
 						"water:1.0";
+				System.out.println(dockerCommand);
 				ProcessBuilder processBuilder = new ProcessBuilder(dockerCommand.split(" "));
 				LogService.addLog(aid,jid,"Water","求解——————————————————开始");
 //				Runtime runtime = Runtime.getRuntime();

+ 5 - 3
src/main/resources/templates/mashGasRunsh.ftl

@@ -5,11 +5,13 @@ export PATH="/home/disaster/gas/mpich2/bin:/home/disaster/gas/bin:$PATH"
 ./convert_input --path=${casepath}
 ./grid_split --path=${casepath}
 ./prepch --path=${casepath}
-
 mpirun -n 4 ./solver --path=${casepath}
-
+mpirun -n 4 ./pstprc --path=${casepath}
+./mrghis --path=${datahis}
 ./couple --proc=3d-1d --path=${casepath} --input-1d=${gascontrol} --delhis
-
+rm -f ${datahis}/*.f
+rm -f ${datahis}/*.g
+rm -f ${datahis}/pressure_max_mid
 cd /home/disaster/zhty/Program
 export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
 ./Gas2 ${gascontrol}