新版求解器修改

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

@@ -37,7 +37,9 @@ public class TemplateGenerator {
         dataModel.put("initFilePath", BPATH+"/"+aid+"/"+jid+"/water"+"/"+"water.init");
 
         //midPath
-        dataModel.put("midPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
+        dataModel.put("midPath", "/home/disaster/Water/monitor.in");
+        //monitorPath
+        dataModel.put("monitorPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
         //outPath
         dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/water"+"/out");
         dataModel.put("totaltime",totaltime);
@@ -46,6 +48,24 @@ public class TemplateGenerator {
         dataModel.put("reportstep",reportstep);
         dataModel.put("interactionstep",interactionstep);
 
+        DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
+        DSourceSQLBuilder dss= new DSourceSQLBuilder();
+        DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
+        dssc.andAidEqualTo(aid);
+//        dssc.andSTypeEqualTo("Fire");
+        List<DSource>  dources =dsm.selectByExample(dss);
+        //waterSourcenum  灾源数量
+        dataModel.put("waterSourcenum", dources.size());
+        //边界
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb =new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
+        //边界数量
+        dataModel.put("boundarynum", boundaries.size());
+
+
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
@@ -80,13 +100,13 @@ public class TemplateGenerator {
     }
     public static void createWaterInit(Integer aid,Integer jid) throws IOException, TemplateException {
         FireInitVo vo =new FireInitVo();
-
-        DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
-        DNodeValSQLBuilder dns = new DNodeValSQLBuilder();
-        DNodeValSQLBuilder.Criteria dnsc= dns.createCriteria();
-        dnsc.andAidEqualTo(aid);
-        List<DNodeVal> nodeVals=dnvm.selectByExample(dns);
-        vo.setNodeVals(nodeVals);
+        //TODO 这个版本不需要传感器数据
+//        DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
+//        DNodeValSQLBuilder dns = new DNodeValSQLBuilder();
+//        DNodeValSQLBuilder.Criteria dnsc= dns.createCriteria();
+//        dnsc.andAidEqualTo(aid);
+//        List<DNodeVal> nodeVals=dnvm.selectByExample(dns);
+//        vo.setNodeVals(nodeVals);
 
         DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
@@ -159,6 +179,8 @@ public class TemplateGenerator {
         //fireInteractionPath 阀门文件路径
         dataModel.put("fireInteractionPath", "/home/disaster/fire/Fire.interaction");
         //midPath
+        dataModel.put("midPath", "/home/disaster/fire/monitor.in");
+        //midPath
         dataModel.put("midPath", BPATH+"/"+aid+"/"+jid+"/fire"+"/mid");
         //outPath
         dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/fire"+"/out");
@@ -186,6 +208,8 @@ public class TemplateGenerator {
         //边界数量
         dataModel.put("boundarynum", boundaries.size());
 
+        //TODO 物理量
+
 
 
         // 将数据模型传入模板进行处理
@@ -223,12 +247,13 @@ public class TemplateGenerator {
     public static void createFireInit(Integer aid,Integer jid) throws IOException, TemplateException {
         FireInitVo vo =new FireInitVo();
 
-        DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
-        DNodeValSQLBuilder dns = new DNodeValSQLBuilder();
-        DNodeValSQLBuilder.Criteria dnsc= dns.createCriteria();
-        dnsc.andAidEqualTo(aid);
-        List<DNodeVal> nodeVals=dnvm.selectByExample(dns);
-        vo.setNodeVals(nodeVals);
+        //TODO 求解器暂时不需要此数据
+//        DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
+//        DNodeValSQLBuilder dns = new DNodeValSQLBuilder();
+//        DNodeValSQLBuilder.Criteria dnsc= dns.createCriteria();
+//        dnsc.andAidEqualTo(aid);
+//        List<DNodeVal> nodeVals=dnvm.selectByExample(dns);
+//        vo.setNodeVals(nodeVals);
 
         DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
         DSourceSQLBuilder dss= new DSourceSQLBuilder();

src/main/resources/templates/fireControl.ftl

@@ -1,6 +1,7 @@
 geoFile : ${geoFilePath}
 initFile :  ${initFilePath}
 interaction file name : ${fireInteractionPath}
+monitorFile : ${monitorPath}
 midPath : ${midPath}
 outPath : ${outPath}
 totaltime: ${totaltime}
@@ -11,6 +12,5 @@ interactionstep : ${interactionstep}
 Boundary number :${boundarynum}
 FireSource number:${fireSourceNum}
 Number Con:2
-Con name: SO2 CO2
-Heat diffusion coefficient:0.1
-Mass diffusion coefficient:0.1 0.2
+SO2,0.1
+CO2,0.2

src/main/resources/templates/fireInit.ftl

@@ -1,8 +1,5 @@
 <#setting number_format="0.##">
 #nodes
-<#list vo.nodeVals as nval>
-${nval.nname},${nval.ntype} ,${nval.val1} ,${nval.val2} ,${nval.val3} ,${nval.val4}
-</#list>
 #end
 #boundaries Inlet
 <#list boundaries as b>

src/main/resources/templates/fireInit.ftlbak

@@ -0,0 +1,19 @@
+<#setting number_format="0.##">
+#nodes
+<#list vo.nodeVals as nval>
+${nval.nname},${nval.ntype} ,${nval.val1} ,${nval.val2} ,${nval.val3} ,${nval.val4}
+</#list>
+#end
+#boundaries Inlet
+<#list boundaries as b>
+${b.nname},${b.type},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
+</#list>
+#end
+#Fires
+<#list vo.dourceVos as d>
+Fire ${d.dsource.pname} ${d.dsource.site} ${d.dsourceVals?size}
+<#list d.dsourceVals as dv>
+${dv.timeline}  ${dv.val1}  ${dv.val2}  ${dv.val3}
+</#list>
+</#list>
+#end

src/main/resources/templates/fireRunsh.ftl

@@ -1,4 +1,3 @@
 cd /home/disaster/fire
 export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
 ./Fire ${firecontrolPath}
-./Fire ${firecontrolPath} restart

src/main/resources/templates/waterControl.ftl

@@ -2,9 +2,11 @@ geoFile : ${geoFilePath}
 initFile : ${initFilePath}
 midPath : ${midPath}
 outPath : ${outPath}
+monitorFile : ${monitorPath}
 totaltime: ${totaltime}
 report step: ${reportstep}
 interactionstep : ${interactionstep}
 dt : ${dt}
 dx : ${dx}
-
+Boundary number : ${boundarynum}
+WaterSource number : ${waterSourcenum}

src/main/resources/templates/waterInit.ftlbak

@@ -0,0 +1,16 @@
+<#setting number_format="0.##">
+#nodes
+#end
+#boundaries Inlet
+<#list boundaries as b>
+${b.nname},${b.type},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
+</#list>
+#end
+#waters
+<#list vo.dourceVos as d>
+water ${d.dsource.pname} ${d.dsource.pname} ${d.dsource.site} ${d.dsourceVals?size}
+<#list d.dsourceVals as dv>
+${dv.timeline}  ${dv.val1}  ${dv.val2}  ${dv.val3}
+</#list>
+</#list>
+#end

src/main/resources/templates/waterRunsh.ftl

@@ -1,5 +1,3 @@
 cd /home/disaster/Water
 ./pre   ${waterControlPath}
 ./Water ${waterControlPath}
-./Water ${waterControlPath} restart
-./Water ${waterControlPath} restart

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10014_A(物理属性添加修改).csv

@@ -4,4 +4,9 @@
 3,name,名称,string,,,是,,,,,,,,
 4,density,密度,double,0,,是,,,,,,,,
 5,diffcoe,扩散系数,double,0,,是,,,,,,,,
-6,speheat,比热,double,0,,是,,,,,,,,
+6,speheat,比热,double,0,,是,,,,,,,,
+
+
+
+
+