火灾水灾 求解器修改

src/main/java/com/miniframe/template/TemplateGenerator2.java

@@ -38,6 +38,8 @@ public class TemplateGenerator2 {
         dataModel.put("monitorPath", BPATH + "/" + aid + "/" + jid + "/monitor.in");
         //outPath
         dataModel.put("outPath", BPATH + "/" + aid + "/" + jid + "/water" + "/out");
+        //devicePath
+        dataModel.put("devicePath", BPATH + "/" + aid + "/" + jid + "/device.txt");
         dataModel.put("totaltime", totaltime);
         dataModel.put("dt", dt);
         dataModel.put("dx", dx);
@@ -402,7 +404,8 @@ public class TemplateGenerator2 {
         dataModel.put("midPath", BPATH + "/" + aid + "/" + jid + "/fire" + "/mid");
         //outPath
         dataModel.put("outPath", BPATH + "/" + aid + "/" + jid + "/fire" + "/out");
-
+        //devicePath
+        dataModel.put("devicePath", BPATH + "/" + aid + "/" + jid + "/device.txt");
         dataModel.put("totaltime", totaltime);
         dataModel.put("dt", dt);
         dataModel.put("dx", dx);

src/main/resources/templates/fire2Control.ftl

@@ -1,7 +1,7 @@
 geoFile : ${geoFilePath}
 initFile :  ${initFilePath}
 interaction file name : ${fireInteractionPath}
-equipmentFile : /home/disaster/zhty/Program/Equipment
+equipmentFile : ${devicePath}
 monitorFile : ${monitorPath}
 peakFile : /home/disaster/zhty/Program/peakin
 midPath : ${midPath}

src/main/resources/templates/water2Control.ftl

@@ -1,7 +1,7 @@
 geoFile : ${geoFilePath}
 initFile : ${initFilePath}
 monitorFile : ${monitorPath}
-equipmentFile : /home/disaster/zhty/Program/Equipment
+equipmentFile : ${devicePath}
 midPath : ${midPath}
 outPath : ${outPath}
 calpeak : OK