重构质量模型并补充回热器分段建模

brayton_cycle/properties.py

@@ -60,6 +60,15 @@ class CO2PropertyCalculator():
         
         # 补充提取的物性，这里由于后续还要使用，不进行参数变换
         properties['D'] = result.D
-        properties['cp'] = result.Cp   
-        properties['cv'] = result.Cv,     
+        properties['density_kg_m3'] = result.D * self.mw
+        properties['cp'] = result.Cp
+        properties['cp_j_kg_k'] = result.Cp / self.mw * 1000
+        properties['cv'] = result.Cv
+        properties['cv_j_kg_k'] = result.Cv / self.mw * 1000
+
+        transport = self.rp.TRNPRPdll(result.T, result.D, self.z)
+        if transport.ierr > 0:
+            raise ValueError(f"REFPROP transport calculation error:{transport.ierr}")
+        properties['viscosity_pa_s'] = transport.eta * 1e-6
+        properties['thermal_conductivity_w_m_k'] = transport.tcx
         return properties