0503

wenbinyugroup · May 3, 2021 · 0011931 · 0011931
1 parent 165d751
commit 0011931
Show file tree

Hide file tree

Showing 5 changed files with 267,662 additions and 267,657 deletions.
diff --git a/msgpi/ms/prebeam.py b/msgpi/ms/prebeam.py
@@ -548,10 +548,14 @@ def preBeam2(fn_beam):
             param_name = xe_distribution.find('parameter').text
 
             func_name = xe_distribution.find('function').text
+            value_type = 'float'
+            xe_type = xe_distribution.find('type')
+            if xe_type is not None:
+                value_type = xe_distribution.find('type').text
             m = 1.0
             if xe_distribution.find('multiplier'):
                 m = float(xe_distribution.find('multiplier').text)
-            beam.distributions[param_name] = [func_name, m]
+            beam.distributions[param_name] = [func_name, m, value_type]
 
 
 

diff --git a/msgpi/sg.py b/msgpi/sg.py
@@ -777,7 +777,7 @@ def writeGmshElements(self, fo, nid_begin=1, eid_begin=1):
                 elem_type = 2
                 if len(econnct) == 4:
                     elem_type = 3
-                line = [i+eid_begin, elem_type, 2, 1, 1]
+                line = [i+eid_begin, elem_type, 2, self.elem_prop[eid], self.elem_prop[eid]]
                 econnct = [nid + nid_begin - 1 for nid in econnct]
             line = line + econnct
             ioutil.writeFormatIntegers(fo, line)