From c3904896ecb869d4147b749b00db9e88736bf444 Mon Sep 17 00:00:00 2001
From: lx <ex_lixiang17@cosl.com.cn>
Date: 星期一, 07 七月 2025 14:47:15 +0800
Subject: [PATCH] update database

---
 ErrorAnalysis.Repository/Entity/GasnearResultTable.cs    |   12 
 ErrorAnalysis.Repository/Entity/GasfarResultTable.cs     |   12 
 ErrorAnalysis.Repository/Entity/RetMcnpDbContext.cs      |  883 +++++++++++------------------------------
 ErrorAnalysis.Repository/Entity/SigfarResultTable.cs     |   12 
 ErrorAnalysis.Repository/Entity/SignearResultTable.cs    |    6 
 ErrorAnalysis.Repository/orm.txt                         |    1 
 ErrorAnalysis.Repository/Entity/CONearWOLTable.cs        |    6 
 ErrorAnalysis.Repository/Entity/COFarWOLTable.cs         |    6 
 ErrorAnalysis.Repository/Entity/GasmodelTable.cs         |   10 
 ErrorAnalysis.Repository/Entity/SigmodelTable.cs         |   22 
 ErrorAnalysis.Repository/COWOLRepository.cs              |   18 
 ErrorAnalysis.Repository/CONearWOLRepository.cs          |   18 
 ErrorAnalysis.Repository/Entity/Gasrintable.cs           |   24 
 ErrorAnalysis.Repository/Entity/COCASIRTable.cs          |    2 
 ErrorAnalysis.Repository/ErrorAnalysis.Repository.csproj |    5 
 ErrorAnalysis.Repository/COFarWOLRepository.cs           |   18 
 ErrorAnalysis.Repository/Entity/Gasrcaptable.cs          |   24 
 ErrorAnalysis.Repository/Entity/GaslongResultTable.cs    |   12 
 ErrorAnalysis.Service/COMergeCalcService.cs              |   11 
 ErrorAnalysis.Repository/CONearResultRepository.cs       |   18 
 ErrorAnalysis.Repository/Entity/Sigwoltable.cs           |   30 
 ErrorAnalysis.Repository/Entity/COModelTable.cs          |   10 
 ErrorAnalysis.Repository/Entity/COWOLTable.cs            |    8 
 ErrorAnalysis.Repository/COFarResultRepository.cs        |   18 
 ErrorAnalysis.Repository/COModelRepository.cs            |   16 
 ErrorAnalysis.Repository/Entity/SiglongResultTable.cs    |    6 
 26 files changed, 402 insertions(+), 806 deletions(-)

diff --git a/ErrorAnalysis.Repository/COFarResultRepository.cs b/ErrorAnalysis.Repository/COFarResultRepository.cs
index 8554aed..63be29a 100644
--- a/ErrorAnalysis.Repository/COFarResultRepository.cs
+++ b/ErrorAnalysis.Repository/COFarResultRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,13 +11,13 @@
     {
         public COFarResultRepository(string connectionString) : base(connectionString) { }
 
-        public COFarResultTable GetCOFarResult(string modelId, int porosity, int sw)
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                var result = context.COFarResultTables.FirstOrDefault(x => x.ModelID == modelId && x.Porosity == porosity && x.Sw == sw);
-                return result;
-            }
-        }
+        //public COFarResultTable GetCOFarResult(string modelId, int porosity, int sw)
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        var result = context.COFarResultTables.FirstOrDefault(x => x.ModelID == modelId && x.Porosity == porosity && x.Sw == sw);
+        //        return result;
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/COFarWOLRepository.cs b/ErrorAnalysis.Repository/COFarWOLRepository.cs
index cc32072..11505e1 100644
--- a/ErrorAnalysis.Repository/COFarWOLRepository.cs
+++ b/ErrorAnalysis.Repository/COFarWOLRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,13 +11,13 @@
     {
         public COFarWOLRepository(string connectionString) : base(connectionString) { }
 
-        public COFarWOLTable GetCOFarWOL(string modelId, int sw)
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                var result = context.COFarWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
-                return result;
-            }
-        }
+        //public COFarWOLTable GetCOFarWOL(string modelId, int sw)
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        var result = context.COFarWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
+        //        return result;
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/COModelRepository.cs b/ErrorAnalysis.Repository/COModelRepository.cs
index 3c86097..763cc41 100644
--- a/ErrorAnalysis.Repository/COModelRepository.cs
+++ b/ErrorAnalysis.Repository/COModelRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,12 +11,12 @@
     {
         public COModelRepository(string connectionString) : base(connectionString) { }
 
-        public List<COModelTable> GetCOModels()
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                return context.COModelTables.ToList().OrderBy(c => c.BIT).OrderBy(c => c.CasingOD).ToList();
-            }
-        }
+        //public List<COModelTable> GetCOModels()
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        return context.COModelTables.ToList().OrderBy(c => c.BIT).OrderBy(c => c.CasingOD).ToList();
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/CONearResultRepository.cs b/ErrorAnalysis.Repository/CONearResultRepository.cs
index d3ef32c..65d64b8 100644
--- a/ErrorAnalysis.Repository/CONearResultRepository.cs
+++ b/ErrorAnalysis.Repository/CONearResultRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,13 +11,13 @@
     {
         public CONearResultRepository(string connectionString) : base(connectionString) { }
 
-        public CONearResultTable GetCONearResult(string modelId, int porosity, int sw)
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                var result = context.CONearResultTables.FirstOrDefault(x => x.ModelID == modelId && x.Porosity == porosity && x.Sw == sw);
-                return result;
-            }
-        }
+        //public CONearResultTable GetCONearResult(string modelId, int porosity, int sw)
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        var result = context.CONearResultTables.FirstOrDefault(x => x.ModelID == modelId && x.Porosity == porosity && x.Sw == sw);
+        //        return result;
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/CONearWOLRepository.cs b/ErrorAnalysis.Repository/CONearWOLRepository.cs
index 3f50071..f035a6f 100644
--- a/ErrorAnalysis.Repository/CONearWOLRepository.cs
+++ b/ErrorAnalysis.Repository/CONearWOLRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,13 +11,13 @@
     {
         public CONearWOLRepository(string connectionString) : base(connectionString) { }
 
-        public CONearWOLTable GetCONearWOL(string modelId, int sw)
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                var result = context.CONearWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
-                return result;
-            }
-        }
+        //public CONearWOLTable GetCONearWOL(string modelId, int sw)
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        var result = context.CONearWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
+        //        return result;
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/COWOLRepository.cs b/ErrorAnalysis.Repository/COWOLRepository.cs
index d2ecfcf..af80979 100644
--- a/ErrorAnalysis.Repository/COWOLRepository.cs
+++ b/ErrorAnalysis.Repository/COWOLRepository.cs
@@ -1,4 +1,4 @@
-锘縰sing ErrorAnalysis.Repository.Entity;
+锘�//using ErrorAnalysis.Repository.Entity;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,13 +11,13 @@
     {
         public COWOLRepository(string connectionString) : base(connectionString) { }
 
-        public COWOLTable GetWOL(string modelId, int sw)
-        {
-            using (var context = new RetMcnpDbContext(_connectionString))
-            {
-                var result = context.COWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
-                return result;
-            }
-        }
+        //public COWOLTable GetWOL(string modelId, int sw)
+        //{
+        //    using (var context = new RetMcnpDbContext(_connectionString))
+        //    {
+        //        var result = context.COWOLTables.FirstOrDefault(x => x.ModelID == modelId && x.Sw == sw);
+        //        return result;
+        //    }
+        //}
     }
 }
diff --git a/ErrorAnalysis.Repository/Entity/CCOCASIRTable.cs b/ErrorAnalysis.Repository/Entity/COCASIRTable.cs
similarity index 94%
rename from ErrorAnalysis.Repository/Entity/CCOCASIRTable.cs
rename to ErrorAnalysis.Repository/Entity/COCASIRTable.cs
index a6f4682..53bffd3 100644
--- a/ErrorAnalysis.Repository/Entity/CCOCASIRTable.cs
+++ b/ErrorAnalysis.Repository/Entity/COCASIRTable.cs
@@ -3,7 +3,7 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class CCOCASIRTable
+public partial class COCASIRTable
 {
     public string COCASIRID { get; set; } = null!;
 
diff --git a/ErrorAnalysis.Repository/Entity/COFarWOLTable.cs b/ErrorAnalysis.Repository/Entity/COFarWOLTable.cs
index f56b98a..7debe65 100644
--- a/ErrorAnalysis.Repository/Entity/COFarWOLTable.cs
+++ b/ErrorAnalysis.Repository/Entity/COFarWOLTable.cs
@@ -29,9 +29,9 @@
 
     public double? WLPu40 { get; set; }
 
-    public double? A0 { get; set; }
+    public double? a0 { get; set; }
 
-    public double? A1 { get; set; }
+    public double? a1 { get; set; }
 
-    public double? A2 { get; set; }
+    public double? a2 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/COModelTable.cs b/ErrorAnalysis.Repository/Entity/COModelTable.cs
index ae74d92..3465b76 100644
--- a/ErrorAnalysis.Repository/Entity/COModelTable.cs
+++ b/ErrorAnalysis.Repository/Entity/COModelTable.cs
@@ -7,15 +7,15 @@
 {
     public string ModelID { get; set; } = null!;
 
-    public decimal BIT { get; set; }
+    public string BIT { get; set; } = null!;
 
-    public decimal CasingOD { get; set; }
+    public string CasingOD { get; set; } = null!;
 
-    public decimal CasingID { get; set; }
+    public string CasingID { get; set; } = null!;
 
-    public decimal? ScreenOD { get; set; }
+    public string? ScreenOD { get; set; }
 
-    public string? ScreenID { get; set; }
+    public decimal? ScreenID { get; set; }
 
     public string TubeOD { get; set; } = null!;
 
diff --git a/ErrorAnalysis.Repository/Entity/CONearWOLTable.cs b/ErrorAnalysis.Repository/Entity/CONearWOLTable.cs
index 560204d..1ccd019 100644
--- a/ErrorAnalysis.Repository/Entity/CONearWOLTable.cs
+++ b/ErrorAnalysis.Repository/Entity/CONearWOLTable.cs
@@ -29,9 +29,9 @@
 
     public double? WLPu40 { get; set; }
 
-    public double? A0 { get; set; }
+    public double? a0 { get; set; }
 
-    public double? A1 { get; set; }
+    public double? a1 { get; set; }
 
-    public double? A2 { get; set; }
+    public double? a2 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/COWOLTable.cs b/ErrorAnalysis.Repository/Entity/COWOLTable.cs
index dd215ad..460559e 100644
--- a/ErrorAnalysis.Repository/Entity/COWOLTable.cs
+++ b/ErrorAnalysis.Repository/Entity/COWOLTable.cs
@@ -5,7 +5,7 @@
 
 public partial class COWOLTable
 {
-    public string COSICARID { get; set; } = null!;
+    public string COWOLID { get; set; } = null!;
 
     public string ModelID { get; set; } = null!;
 
@@ -29,9 +29,9 @@
 
     public double? WLPu40 { get; set; }
 
-    public double? A0 { get; set; }
+    public double? a0 { get; set; }
 
-    public double? A1 { get; set; }
+    public double? a1 { get; set; }
 
-    public double? A2 { get; set; }
+    public double? a2 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/GasfarResultTable.cs b/ErrorAnalysis.Repository/Entity/GasfarResultTable.cs
index 2b3e2ef..fa6fdd8 100644
--- a/ErrorAnalysis.Repository/Entity/GasfarResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/GasfarResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class GasfarResultTable
+public partial class GASFarResultTable
 {
-    public string? Id { get; set; }
+    public string? ID { get; set; }
 
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
     public int? Porosity { get; set; }
 
@@ -21,9 +21,9 @@
 
     public string? TimeSpec { get; set; }
 
-    public string? CinelasticSpec { get; set; }
+    public string? CInelasticSpec { get; set; }
 
-    public string? Ccapture1Spec { get; set; }
+    public string? CCapture1Spec { get; set; }
 
-    public string? Ccapture2Spec { get; set; }
+    public string? CCapture2Spec { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/GaslongResultTable.cs b/ErrorAnalysis.Repository/Entity/GaslongResultTable.cs
index b2152dc..0a36a47 100644
--- a/ErrorAnalysis.Repository/Entity/GaslongResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/GaslongResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class GaslongResultTable
+public partial class GASLongResultTable
 {
-    public string? Id { get; set; }
+    public string? ID { get; set; }
 
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
     public int? Porosity { get; set; }
 
@@ -21,9 +21,9 @@
 
     public string? TimeSpec { get; set; }
 
-    public string? CinelasticSpec { get; set; }
+    public string? CInelasticSpec { get; set; }
 
-    public string? Ccapture1Spec { get; set; }
+    public string? CCapture1Spec { get; set; }
 
-    public string? Ccapture2Spec { get; set; }
+    public string? CCapture2Spec { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/GasmodelTable.cs b/ErrorAnalysis.Repository/Entity/GasmodelTable.cs
index 636f14f..9dfca5a 100644
--- a/ErrorAnalysis.Repository/Entity/GasmodelTable.cs
+++ b/ErrorAnalysis.Repository/Entity/GasmodelTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class GasmodelTable
+public partial class GASModelTable
 {
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
-    public string? Bit { get; set; }
+    public string? BIT { get; set; }
 
     public string? CasingDiameter { get; set; }
 
@@ -17,11 +17,11 @@
 
     public string? Lithology { get; set; }
 
-    public string? Vsh { get; set; }
+    public string? VSH { get; set; }
 
     public string? OilDensity { get; set; }
 
-    public string? Bhsalinity { get; set; }
+    public string? BHSalinity { get; set; }
 
     public string? ReservoirSalinity { get; set; }
 
diff --git a/ErrorAnalysis.Repository/Entity/GasnearResultTable.cs b/ErrorAnalysis.Repository/Entity/GasnearResultTable.cs
index c24bbfc..ab686bd 100644
--- a/ErrorAnalysis.Repository/Entity/GasnearResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/GasnearResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class GasnearResultTable
+public partial class GASNearResultTable
 {
-    public string? Id { get; set; }
+    public string? ID { get; set; }
 
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
     public int? Porosity { get; set; }
 
@@ -21,9 +21,9 @@
 
     public string? TimeSpec { get; set; }
 
-    public string? CinelasticSpec { get; set; }
+    public string? CInelasticSpec { get; set; }
 
-    public string? Ccapture1Spec { get; set; }
+    public string? CCapture1Spec { get; set; }
 
-    public string? Ccapture2Spec { get; set; }
+    public string? CCapture2Spec { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/Gasrcaptable.cs b/ErrorAnalysis.Repository/Entity/Gasrcaptable.cs
index c6fa0c2..6cc5a03 100644
--- a/ErrorAnalysis.Repository/Entity/Gasrcaptable.cs
+++ b/ErrorAnalysis.Repository/Entity/Gasrcaptable.cs
@@ -3,29 +3,29 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class Gasrcaptable
+public partial class GASRCAPTable
 {
-    public string? Gasrcapid { get; set; }
+    public string? GASRCAPID { get; set; }
 
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
     public int? Sw { get; set; }
 
-    public double? Wlpu0 { get; set; }
+    public double? WLPu0 { get; set; }
 
-    public double? Wlpu5 { get; set; }
+    public double? WLPu5 { get; set; }
 
-    public double? Wlpu10 { get; set; }
+    public double? WLPu10 { get; set; }
 
-    public double? Wlpu15 { get; set; }
+    public double? WLPu15 { get; set; }
 
-    public double? Wlpu20 { get; set; }
+    public double? WLPu20 { get; set; }
 
-    public double? Wlpu25 { get; set; }
+    public double? WLPu25 { get; set; }
 
-    public double? Wlpu30 { get; set; }
+    public double? WLPu30 { get; set; }
 
-    public double? Wlpu35 { get; set; }
+    public double? WLPu35 { get; set; }
 
-    public double? Wlpu40 { get; set; }
+    public double? WLPu40 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/Gasrintable.cs b/ErrorAnalysis.Repository/Entity/Gasrintable.cs
index a4d0e89..d9e7b76 100644
--- a/ErrorAnalysis.Repository/Entity/Gasrintable.cs
+++ b/ErrorAnalysis.Repository/Entity/Gasrintable.cs
@@ -3,29 +3,29 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class Gasrintable
+public partial class GASRINTable
 {
-    public string? Gasrinid { get; set; }
+    public string? GASRINID { get; set; }
 
-    public string? ModelId { get; set; }
+    public string? ModelID { get; set; }
 
     public int? Sw { get; set; }
 
-    public double? Wlpu0 { get; set; }
+    public double? WLPu0 { get; set; }
 
-    public double? Wlpu5 { get; set; }
+    public double? WLPu5 { get; set; }
 
-    public double? Wlpu10 { get; set; }
+    public double? WLPu10 { get; set; }
 
-    public double? Wlpu15 { get; set; }
+    public double? WLPu15 { get; set; }
 
-    public double? Wlpu20 { get; set; }
+    public double? WLPu20 { get; set; }
 
-    public double? Wlpu25 { get; set; }
+    public double? WLPu25 { get; set; }
 
-    public double? Wlpu30 { get; set; }
+    public double? WLPu30 { get; set; }
 
-    public double? Wlpu35 { get; set; }
+    public double? WLPu35 { get; set; }
 
-    public double? Wlpu40 { get; set; }
+    public double? WLPu40 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/RetMcnpDbContext.cs b/ErrorAnalysis.Repository/Entity/RetMcnpDbContext.cs
index 475a315..7b2995d 100644
--- a/ErrorAnalysis.Repository/Entity/RetMcnpDbContext.cs
+++ b/ErrorAnalysis.Repository/Entity/RetMcnpDbContext.cs
@@ -21,8 +21,6 @@
         _connectionString = connectionString;
     }
 
-    public virtual DbSet<CCOCASIRTable> CCOCASIRTables { get; set; }
-
     public virtual DbSet<COFarCASIRTable> COFarCASIRTables { get; set; }
 
     public virtual DbSet<COFarResultTable> COFarResultTables { get; set; }
@@ -47,72 +45,51 @@
 
     public virtual DbSet<COWOLTable> COWOLTables { get; set; }
 
-    public virtual DbSet<GasfarResultTable> GasfarResultTables { get; set; }
+    public virtual DbSet<GASFarResultTable> GASFarResultTables { get; set; }
 
-    public virtual DbSet<GaslongResultTable> GaslongResultTables { get; set; }
+    public virtual DbSet<GASLongResultTable> GASLongResultTables { get; set; }
 
-    public virtual DbSet<GasmodelTable> GasmodelTables { get; set; }
+    public virtual DbSet<GASModelTable> GASModelTables { get; set; }
 
-    public virtual DbSet<GasnearResultTable> GasnearResultTables { get; set; }
+    public virtual DbSet<GASNearResultTable> GASNearResultTables { get; set; }
 
-    public virtual DbSet<Gasrcaptable> Gasrcaptables { get; set; }
+    public virtual DbSet<GASRCAPTable> GASRCAPTables { get; set; }
 
-    public virtual DbSet<Gasrintable> Gasrintables { get; set; }
+    public virtual DbSet<GASRINTable> GASRINTables { get; set; }
 
-    public virtual DbSet<SigfarResultTable> SigfarResultTables { get; set; }
+    public virtual DbSet<SIGFarResultTable> SIGFarResultTables { get; set; }
 
-    public virtual DbSet<SiglongResultTable> SiglongResultTables { get; set; }
+    public virtual DbSet<SIGLongResultTable> SIGLongResultTables { get; set; }
 
-    public virtual DbSet<SigmodelTable> SigmodelTables { get; set; }
+    public virtual DbSet<SIGModelTable> SIGModelTables { get; set; }
 
-    public virtual DbSet<SignearResultTable> SignearResultTables { get; set; }
+    public virtual DbSet<SIGNearResultTable> SIGNearResultTables { get; set; }
 
-    public virtual DbSet<Sigwoltable> Sigwoltables { get; set; }
+    public virtual DbSet<SIGWOLTable> SIGWOLTables { get; set; }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) => optionsBuilder.UseSqlite(_connectionString);
     //"Data Source=D:\\Pro\\cosl\\ErrorRate\\RetMcnpDB.db"
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<CCOCASIRTable>(entity =>
+        modelBuilder.Entity<COCASIRTable>(entity =>
         {
             entity.HasKey(e => e.COCASIRID);
 
             entity.ToTable("COCASIRTable");
 
-            entity.Property(e => e.COCASIRID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COCASIRID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COCASIRID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COFarCASIRTable>(entity =>
@@ -121,64 +98,32 @@
 
             entity.ToTable("COFarCASIRTable");
 
-            entity.Property(e => e.COCASIRID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COCASIRID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COCASIRID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COFarResultTable>(entity =>
         {
             entity.ToTable("COFarResultTable");
 
-            entity.Property(e => e.ID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.CCapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.CCapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CInelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
@@ -190,40 +135,18 @@
 
             entity.ToTable("COFarSICARTable");
 
-            entity.Property(e => e.COSICARID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COSICARID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COSICARID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COFarWOLTable>(entity =>
@@ -232,49 +155,21 @@
 
             entity.ToTable("COFarWOLTable");
 
-            entity.Property(e => e.COWOLID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COWOLID");
-            entity.Property(e => e.A0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a0");
-            entity.Property(e => e.A1)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a1");
-            entity.Property(e => e.A2)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a2");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COWOLID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
+            entity.Property(e => e.a0).HasColumnType("DOUBLE");
+            entity.Property(e => e.a1).HasColumnType("DOUBLE");
+            entity.Property(e => e.a2).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COLongResultTable>(entity =>
@@ -283,24 +178,14 @@
                 .HasNoKey()
                 .ToTable("COLongResultTable");
 
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NUMERIC(4000)");
-            entity.Property(e => e.CCapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.CCapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CInelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
-            entity.Property(e => e.ID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
@@ -312,44 +197,24 @@
 
             entity.ToTable("COModelTable");
 
-            entity.Property(e => e.ModelID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
-            entity.Property(e => e.BHSalinity)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BHSalinity");
-            entity.Property(e => e.BIT)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BIT");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.BHSalinity).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.BIT).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CasingFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.CasingID)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("CasingID");
-            entity.Property(e => e.CasingOD)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("CasingOD");
+            entity.Property(e => e.CasingID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.CasingOD).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CementBond).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.GravelFillPercent).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.Lithology).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.OilDensity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ReservoirSalinity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ScreenFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.ScreenID)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("ScreenID");
-            entity.Property(e => e.ScreenOD)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("ScreenOD");
+            entity.Property(e => e.ScreenID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.ScreenOD).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.TubeFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.TubeID)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("TubeID");
-            entity.Property(e => e.TubeOD)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("TubeOD");
-            entity.Property(e => e.VSH)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("VSH");
+            entity.Property(e => e.TubeID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.TubeOD).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.VSH).HasColumnType("NVARCHAR(50)");
         });
 
         modelBuilder.Entity<CONearCASIRTable>(entity =>
@@ -358,64 +223,32 @@
 
             entity.ToTable("CONearCASIRTable");
 
-            entity.Property(e => e.COCASIRID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COCASIRID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COCASIRID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<CONearResultTable>(entity =>
         {
             entity.ToTable("CONearResultTable");
 
-            entity.Property(e => e.ID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.CCapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.CCapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CInelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
@@ -427,40 +260,18 @@
 
             entity.ToTable("CONearSICARTable");
 
-            entity.Property(e => e.COSICARID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COSICARID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COSICARID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<CONearWOLTable>(entity =>
@@ -469,49 +280,21 @@
 
             entity.ToTable("CONearWOLTable");
 
-            entity.Property(e => e.COWOLID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COWOLID");
-            entity.Property(e => e.A0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a0");
-            entity.Property(e => e.A1)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a1");
-            entity.Property(e => e.A2)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a2");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COWOLID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
+            entity.Property(e => e.a0).HasColumnType("DOUBLE");
+            entity.Property(e => e.a1).HasColumnType("DOUBLE");
+            entity.Property(e => e.a2).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COSICARTable>(entity =>
@@ -520,452 +303,254 @@
 
             entity.ToTable("COSICARTable");
 
-            entity.Property(e => e.COSICARID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COSICARID");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COSICARID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
         modelBuilder.Entity<COWOLTable>(entity =>
         {
-            entity.HasKey(e => e.COSICARID);
+            entity.HasKey(e => e.COWOLID);
 
             entity.ToTable("COWOLTable");
 
-            entity.Property(e => e.COSICARID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("COWOLID");
-            entity.Property(e => e.A0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a0");
-            entity.Property(e => e.A1)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a1");
-            entity.Property(e => e.A2)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a2");
-            entity.Property(e => e.ModelID)
-                .HasColumnType("nvarchar(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COWOLID).HasColumnType("nvarchar(200)");
+            entity.Property(e => e.ModelID).HasColumnType("nvarchar(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.WLPu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.WLPu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.WLPu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.WLPu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.WLPu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.WLPu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.WLPu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.WLPu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.WLPu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
+            entity.Property(e => e.a0).HasColumnType("DOUBLE");
+            entity.Property(e => e.a1).HasColumnType("DOUBLE");
+            entity.Property(e => e.a2).HasColumnType("DOUBLE");
         });
 
-        modelBuilder.Entity<GasfarResultTable>(entity =>
+        modelBuilder.Entity<GASFarResultTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASFarResultTable");
 
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.Ccapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.Ccapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CinelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<GaslongResultTable>(entity =>
+        modelBuilder.Entity<GASLongResultTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASLongResultTable");
 
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.Ccapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.Ccapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CinelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<GasmodelTable>(entity =>
+        modelBuilder.Entity<GASModelTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASModelTable");
 
             entity.Property(e => e.AnnulusOilHoldUp).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.Bhsalinity)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BHSalinity");
-            entity.Property(e => e.Bit)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BIT");
+            entity.Property(e => e.BHSalinity).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.BIT).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CasingDiameter).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CementBond).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.GravelFill).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.Lithology).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.OilDensity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ReservoirSalinity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ScreenPipeDiameter).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.TubeDiameter).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.TubeOilHoldUp).HasColumnType("NVARCHAR");
-            entity.Property(e => e.Vsh)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("VSH");
+            entity.Property(e => e.VSH).HasColumnType("NVARCHAR(50)");
         });
 
-        modelBuilder.Entity<GasnearResultTable>(entity =>
+        modelBuilder.Entity<GASNearResultTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASNearResultTable");
 
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.Ccapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.Ccapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CinelasticSpec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CInelasticSpec");
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<Gasrcaptable>(entity =>
+        modelBuilder.Entity<GASRCAPTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASRCAPTable");
 
-            entity.Property(e => e.Gasrcapid)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("GASRCAPID");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.GASRCAPID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.Wlpu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.Wlpu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.Wlpu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.Wlpu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.Wlpu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.Wlpu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.Wlpu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.Wlpu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.Wlpu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
-        modelBuilder.Entity<Gasrintable>(entity =>
+        modelBuilder.Entity<GASRINTable>(entity =>
         {
             entity
                 .HasNoKey()
                 .ToTable("GASRINTable");
 
-            entity.Property(e => e.Gasrinid)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("GASRINID");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.GASRINID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.Wlpu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.Wlpu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.Wlpu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.Wlpu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.Wlpu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.Wlpu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.Wlpu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.Wlpu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.Wlpu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
         });
 
-        modelBuilder.Entity<SigfarResultTable>(entity =>
+        modelBuilder.Entity<SIGFarResultTable>(entity =>
         {
             entity.ToTable("SIGFarResultTable");
 
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.CCapture1Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CCapture2Spec).HasColumnType("NVARCHAR(4000)");
+            entity.Property(e => e.CInelasticSpec).HasColumnType("NUMERIC(4000)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.Ccapture1Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture1Spec");
-            entity.Property(e => e.Ccapture2Spec)
-                .HasColumnType("NVARCHAR(4000)")
-                .HasColumnName("CCapture2Spec");
-            entity.Property(e => e.CinelasticSpec)
-                .HasColumnType("NUMERIC(4000)")
-                .HasColumnName("CInelasticSpec");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<SiglongResultTable>(entity =>
+        modelBuilder.Entity<SIGLongResultTable>(entity =>
         {
             entity.ToTable("SIGLongResultTable");
 
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<SigmodelTable>(entity =>
+        modelBuilder.Entity<SIGModelTable>(entity =>
         {
-            entity.HasKey(e => e.ModelId);
+            entity.HasKey(e => e.ModelID);
 
             entity.ToTable("SIGModelTable");
 
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
-            entity.Property(e => e.Bhsalinity)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BHSalinity");
-            entity.Property(e => e.Bit)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("BIT");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.BHSalinity).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.BIT).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CasingFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.CasingId)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("CasingID");
-            entity.Property(e => e.CasingOd)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("CasingOD");
+            entity.Property(e => e.CasingID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.CasingOD).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.CementBond).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.GravelFillPercent).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.Lithology).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.OilDensity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ReservoirSalinity).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.ScreenFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.ScreenId)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("ScreenID");
-            entity.Property(e => e.ScreenOd)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("ScreenOD");
+            entity.Property(e => e.ScreenID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.ScreenOD).HasColumnType("NVARCHAR(50)");
             entity.Property(e => e.TubeFluid).HasColumnType("NVARCHAR(50)");
-            entity.Property(e => e.TubeId)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("TubeID");
-            entity.Property(e => e.TubeOd)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("TubeOD");
-            entity.Property(e => e.Vsh)
-                .HasColumnType("NVARCHAR(50)")
-                .HasColumnName("VSH");
+            entity.Property(e => e.TubeID).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.TubeOD).HasColumnType("NVARCHAR(50)");
+            entity.Property(e => e.VSH).HasColumnType("NVARCHAR(50)");
         });
 
-        modelBuilder.Entity<SignearResultTable>(entity =>
+        modelBuilder.Entity<SIGNearResultTable>(entity =>
         {
             entity.ToTable("SIGNearResultTable");
 
-            entity.Property(e => e.Id)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ID");
+            entity.Property(e => e.ID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Capture1Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.Capture2Spec).HasColumnType("NVARCHAR(4000)");
             entity.Property(e => e.InelasticSpec).HasColumnType("NVARCHAR(4000)");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Porosity).HasColumnType("INT");
             entity.Property(e => e.Sw).HasColumnType("INT");
             entity.Property(e => e.TimeSpec).HasColumnType("NVARCHAR(500)");
         });
 
-        modelBuilder.Entity<Sigwoltable>(entity =>
+        modelBuilder.Entity<SIGWOLTable>(entity =>
         {
-            entity.HasKey(e => e.Cowolid);
+            entity.HasKey(e => e.COWOLID);
 
             entity.ToTable("SIGWOLTable");
 
-            entity.Property(e => e.Cowolid)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("COWOLID");
-            entity.Property(e => e.A0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a0");
-            entity.Property(e => e.A1)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a1");
-            entity.Property(e => e.A2)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("a2");
-            entity.Property(e => e.ModelId)
-                .HasColumnType("NVARCHAR(200)")
-                .HasColumnName("ModelID");
+            entity.Property(e => e.COWOLID).HasColumnType("NVARCHAR(200)");
+            entity.Property(e => e.ModelID).HasColumnType("NVARCHAR(200)");
             entity.Property(e => e.Sw).HasColumnType("INT");
-            entity.Property(e => e.Wlpu0)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu0");
-            entity.Property(e => e.Wlpu10)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu10");
-            entity.Property(e => e.Wlpu15)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu15");
-            entity.Property(e => e.Wlpu20)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu20");
-            entity.Property(e => e.Wlpu25)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu25");
-            entity.Property(e => e.Wlpu30)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu30");
-            entity.Property(e => e.Wlpu35)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu35");
-            entity.Property(e => e.Wlpu40)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu40");
-            entity.Property(e => e.Wlpu5)
-                .HasColumnType("DOUBLE")
-                .HasColumnName("WLPu5");
+            entity.Property(e => e.WLPu0).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu10).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu15).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu20).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu25).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu30).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu35).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu40).HasColumnType("DOUBLE");
+            entity.Property(e => e.WLPu5).HasColumnType("DOUBLE");
+            entity.Property(e => e.a0).HasColumnType("DOUBLE");
+            entity.Property(e => e.a1).HasColumnType("DOUBLE");
+            entity.Property(e => e.a2).HasColumnType("DOUBLE");
         });
 
         OnModelCreatingPartial(modelBuilder);
diff --git a/ErrorAnalysis.Repository/Entity/SigfarResultTable.cs b/ErrorAnalysis.Repository/Entity/SigfarResultTable.cs
index fc825e2..e4c2855 100644
--- a/ErrorAnalysis.Repository/Entity/SigfarResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/SigfarResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class SigfarResultTable
+public partial class SIGFarResultTable
 {
-    public string Id { get; set; } = null!;
+    public string ID { get; set; } = null!;
 
-    public string ModelId { get; set; } = null!;
+    public string ModelID { get; set; } = null!;
 
     public int Porosity { get; set; }
 
@@ -21,9 +21,9 @@
 
     public string? TimeSpec { get; set; }
 
-    public decimal? CinelasticSpec { get; set; }
+    public decimal? CInelasticSpec { get; set; }
 
-    public string? Ccapture1Spec { get; set; }
+    public string? CCapture1Spec { get; set; }
 
-    public string? Ccapture2Spec { get; set; }
+    public string? CCapture2Spec { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/Entity/SiglongResultTable.cs b/ErrorAnalysis.Repository/Entity/SiglongResultTable.cs
index cd38b19..7428d24 100644
--- a/ErrorAnalysis.Repository/Entity/SiglongResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/SiglongResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class SiglongResultTable
+public partial class SIGLongResultTable
 {
-    public string Id { get; set; } = null!;
+    public string ID { get; set; } = null!;
 
-    public string ModelId { get; set; } = null!;
+    public string ModelID { get; set; } = null!;
 
     public int Porosity { get; set; }
 
diff --git a/ErrorAnalysis.Repository/Entity/SigmodelTable.cs b/ErrorAnalysis.Repository/Entity/SigmodelTable.cs
index 5df2c9b..6e916a2 100644
--- a/ErrorAnalysis.Repository/Entity/SigmodelTable.cs
+++ b/ErrorAnalysis.Repository/Entity/SigmodelTable.cs
@@ -3,31 +3,31 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class SigmodelTable
+public partial class SIGModelTable
 {
-    public string ModelId { get; set; } = null!;
+    public string ModelID { get; set; } = null!;
 
-    public string Bit { get; set; } = null!;
+    public string BIT { get; set; } = null!;
 
-    public string CasingOd { get; set; } = null!;
+    public string CasingOD { get; set; } = null!;
 
-    public string CasingId { get; set; } = null!;
+    public string CasingID { get; set; } = null!;
 
-    public string? ScreenOd { get; set; }
+    public string? ScreenOD { get; set; }
 
-    public string? ScreenId { get; set; }
+    public string? ScreenID { get; set; }
 
-    public string TubeOd { get; set; } = null!;
+    public string TubeOD { get; set; } = null!;
 
-    public string TubeId { get; set; } = null!;
+    public string TubeID { get; set; } = null!;
 
     public string Lithology { get; set; } = null!;
 
-    public string? Vsh { get; set; }
+    public string? VSH { get; set; }
 
     public string? OilDensity { get; set; }
 
-    public string? Bhsalinity { get; set; }
+    public string? BHSalinity { get; set; }
 
     public string? ReservoirSalinity { get; set; }
 
diff --git a/ErrorAnalysis.Repository/Entity/SignearResultTable.cs b/ErrorAnalysis.Repository/Entity/SignearResultTable.cs
index 7817086..38c436e 100644
--- a/ErrorAnalysis.Repository/Entity/SignearResultTable.cs
+++ b/ErrorAnalysis.Repository/Entity/SignearResultTable.cs
@@ -3,11 +3,11 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class SignearResultTable
+public partial class SIGNearResultTable
 {
-    public string Id { get; set; } = null!;
+    public string ID { get; set; } = null!;
 
-    public string ModelId { get; set; } = null!;
+    public string ModelID { get; set; } = null!;
 
     public int Porosity { get; set; }
 
diff --git a/ErrorAnalysis.Repository/Entity/Sigwoltable.cs b/ErrorAnalysis.Repository/Entity/Sigwoltable.cs
index 39f7fc4..633942e 100644
--- a/ErrorAnalysis.Repository/Entity/Sigwoltable.cs
+++ b/ErrorAnalysis.Repository/Entity/Sigwoltable.cs
@@ -3,35 +3,35 @@
 
 namespace ErrorAnalysis.Repository.Entity;
 
-public partial class Sigwoltable
+public partial class SIGWOLTable
 {
-    public string Cowolid { get; set; } = null!;
+    public string COWOLID { get; set; } = null!;
 
-    public string ModelId { get; set; } = null!;
+    public string ModelID { get; set; } = null!;
 
     public int? Sw { get; set; }
 
-    public double? Wlpu0 { get; set; }
+    public double? WLPu0 { get; set; }
 
-    public double? Wlpu5 { get; set; }
+    public double? WLPu5 { get; set; }
 
-    public double? Wlpu10 { get; set; }
+    public double? WLPu10 { get; set; }
 
-    public double? Wlpu15 { get; set; }
+    public double? WLPu15 { get; set; }
 
-    public double? Wlpu20 { get; set; }
+    public double? WLPu20 { get; set; }
 
-    public double? Wlpu25 { get; set; }
+    public double? WLPu25 { get; set; }
 
-    public double? Wlpu30 { get; set; }
+    public double? WLPu30 { get; set; }
 
-    public double? Wlpu35 { get; set; }
+    public double? WLPu35 { get; set; }
 
-    public double? Wlpu40 { get; set; }
+    public double? WLPu40 { get; set; }
 
-    public double? A0 { get; set; }
+    public double? a0 { get; set; }
 
-    public double? A1 { get; set; }
+    public double? a1 { get; set; }
 
-    public double? A2 { get; set; }
+    public double? a2 { get; set; }
 }
diff --git a/ErrorAnalysis.Repository/ErrorAnalysis.Repository.csproj b/ErrorAnalysis.Repository/ErrorAnalysis.Repository.csproj
index 97e4988..9b65c3e 100644
--- a/ErrorAnalysis.Repository/ErrorAnalysis.Repository.csproj
+++ b/ErrorAnalysis.Repository/ErrorAnalysis.Repository.csproj
@@ -17,6 +17,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.Lolita.Sqlite" Version="6.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Entity\" />
   </ItemGroup>
 
 </Project>
diff --git a/ErrorAnalysis.Repository/orm.txt b/ErrorAnalysis.Repository/orm.txt
new file mode 100644
index 0000000..4bc624e
--- /dev/null
+++ b/ErrorAnalysis.Repository/orm.txt
@@ -0,0 +1 @@
+Scaffold-DbContext "Data Source=D:\Pro\cosl\ErrorRate\RetMcnpDB.db" Microsoft.EntityFrameworkCore.Sqlite -OutputDir Entity -UseDatabaseNames -Force
\ No newline at end of file
diff --git a/ErrorAnalysis.Service/COMergeCalcService.cs b/ErrorAnalysis.Service/COMergeCalcService.cs
index 161d2c1..e3b3051 100644
--- a/ErrorAnalysis.Service/COMergeCalcService.cs
+++ b/ErrorAnalysis.Service/COMergeCalcService.cs
@@ -22,12 +22,17 @@
         const int _oWinStartIndex = (int)(4.88 / _gg + _offset); // org
         const int _oWinEndIndex = (int)(6.36 / _gg + _offset); // width = 6.36-4.88=1.48
 
-        private static double GetInterplolateResult(RepositoryBase repos, string modelId, double porosity, double sw, double speed)
+        private static double GetFarInterplolateResult(COFarResultRepository repos, string modelId, double porosity, double sw, double speed, double depth)
         {
 
         }
 
-        public static double GetFarMergeCResult(string connectionString, string modelId, double porosity, double sw, double speed)
+        private static double GetNearInterplolateResult(COFarResultRepository repos, string modelId, double porosity, double sw, double speed, double depth)
+        {
+
+        }
+
+        public static double GetFarMergeCResult(string connectionString, string modelId, double porosity, double sw, double speed, double depth)
         {
             if (porosity > 40)
                 throw new InvalidDataException("Porosity value out of range!");
@@ -45,7 +50,7 @@
 
                 var length = _cWinEndIndex - _cWinStartIndex + 1;
                 var originC = cArr.Skip(_cWinStartIndex).Take(length).Sum();
-                var coef = originC * 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6 * speed*depth*0.07;
+                var coef = originC * 1e8 * 2.54 * 2.54 * 4 * 6 * 2 * 11 * 77 * 0.2 / 0.6 * speed * depth * 0.07;
                 if (sw > 0)
                     result = Utility.Interpolate(sw, 100, 0, 0, coef);
 

--
Gitblit v1.9.3