Jelajahi Sumber

边界条件添加

huangxingxing 1 tahun lalu
induk
melakukan
2015e55d82

+ 1 - 0
src/main/java/com/miniframe/template/FireInitVo.java

@@ -12,6 +12,7 @@ public class FireInitVo {
     public List<DNodeVal> nodeVals;
     public List<DSourceVo> dourceVos;
 
+
     public List<DNodeVal> getNodeVals() {
         return nodeVals;
     }

+ 20 - 0
src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -2,6 +2,7 @@ package com.miniframe.template;
 
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.model.system.*;
+import com.miniframe.model.system.dao.DBoundaryMapper;
 import com.miniframe.model.system.dao.DNodeValMapper;
 import com.miniframe.model.system.dao.DSourceMapper;
 import com.miniframe.model.system.dao.DSourceValMapper;
@@ -112,6 +113,12 @@ public class TemplateGenerator {
         }
         vo.setDourceVos(dourceVos);
 
+        //边界
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb =new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
 
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
@@ -122,6 +129,9 @@ public class TemplateGenerator {
         Map<String, Object> dataModel = new HashMap<>();
         //几何文件路径
         dataModel.put("vo", vo);
+        //边界
+        dataModel.put("boundaries", boundaries);
+
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
@@ -234,6 +244,13 @@ public class TemplateGenerator {
         }
        vo.setDourceVos(dourceVos);
 
+        //边界
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb =new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
+
 
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
@@ -244,6 +261,9 @@ public class TemplateGenerator {
         Map<String, Object> dataModel = new HashMap<>();
         //几何文件路径
         dataModel.put("vo", vo);
+        //边界
+        dataModel.put("boundaries", boundaries);
+
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);

+ 3 - 3
src/main/resources/templates/fireInit.ftl

@@ -5,9 +5,9 @@ ${nval.nname},${nval.ntype} ,${nval.val1} ,${nval.val2} ,${nval.val3} ,${nval.va
 </#list>
 #end
 #boundaries Inlet
-nodes33 ,massflow ,10,300,0.0,0.0
-nodes35 ,Pressure ,10,300,0.0,0.0
-nodes36 ,pressure ,10,300,0.0,0.0
+<#list boundaries as b>
+${b.nname},${b.type},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
+</#list>
 #end
 #Fires
 <#list vo.dourceVos as d>

+ 3 - 3
src/main/resources/templates/waterInit.ftl

@@ -5,9 +5,9 @@ ${nval.nname},${nval.ntype} ,${nval.val1} ,${nval.val2} ,${nval.val3} ,${nval.va
 </#list>
 #end
 #boundaries Inlet
-nodes33 ,massflow ,10,300,0.0,0.0
-nodes35 ,Pressure ,10,300,0.0,0.0
-nodes36 ,pressure ,10,300,0.0,0.0
+<#list boundaries as b>
+${b.nname},${b.type},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
+</#list>
 #end
 #waters
 <#list vo.dourceVos as d>