Changeset 33948 for branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippconfig

Files:

• . (modified) (1 prop)
• gpc1/ghost.model.mdc (modified) (2 diffs)

branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc

@@ +1 @@
+# Original center models
+# GHOST.CENTER.X METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -4.421024e+01
+#   VAL_X01_Y00  F64 1.216270e-02
+#   VAL_X02_Y00  F64 -9.721643e-08
+#   VAL_X03_Y00  F64 9.976554e-11
+#   VAL_X00_Y01  F64 -1.762476e-03
+#   VAL_X01_Y01  F64 1.247212e-07
+#   VAL_X02_Y01  F64 3.629557e-11
+#   VAL_X00_Y02  F64 -1.040174e-07
+#   VAL_X01_Y02  F64 1.074674e-10
+#   VAL_X00_Y03  F64 1.564112e-11
+#   NELEMENTS  S32 10
+# END
+
+# GHOST.CENTER.Y METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -2.189470e+00
+#   VAL_X01_Y00  F64 -4.186514e-03
+#   VAL_X02_Y00  F64 1.131554e-07
+#   VAL_X03_Y00  F64 1.415192e-11
+#   VAL_X00_Y01  F64 1.569104e-02
+#   VAL_X01_Y01  F64 -1.782801e-07
+#   VAL_X02_Y01  F64 8.179602e-11
+#   VAL_X00_Y02  F64 2.577055e-07
+#   VAL_X01_Y02  F64 8.879423e-11
+#   VAL_X00_Y03  F64 5.767429e-11
+#   NELEMENTS  S32 10
+# END
+
+# Updated models of 2012-05-07
+# Corrected(?) parity
+# GHOST.CENTER.X METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64  3.314569e+01
+#   VAL_X01_Y00  F64  1.110664e-02
+#   VAL_X02_Y00  F64 -1.904158e-07
+#   VAL_X03_Y00  F64  8.470224e-11
+#   VAL_X00_Y01  F64 -1.616877e-03
+#   VAL_X01_Y01  F64  1.646508e-07
+#   VAL_X02_Y01  F64  5.623381e-11
+#   VAL_X00_Y02  F64 -2.342888e-07
+#   VAL_X01_Y02  F64  1.023761e-10
+#   VAL_X00_Y03  F64  2.836980e-11
+#   NELEMENTS  S32 10
+# END
+
+# GHOST.CENTER.Y METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -2.860068e+01
+#   VAL_X01_Y00  F64 -8.790076e-03
+#   VAL_X02_Y00  F64  2.456534e-07
+#   VAL_X03_Y00  F64  2.947749e-11
+#   VAL_X00_Y01  F64  1.948855e-02
+#   VAL_X01_Y01  F64 -2.639927e-07
+#   VAL_X02_Y01  F64  4.951474e-11
+#   VAL_X00_Y02  F64  4.341716e-07
+#   VAL_X01_Y02  F64  1.643046e-10
+#   VAL_X00_Y03  F64 -1.737983e-12
+#   NELEMENTS  S32 10
+# END
+
+# Switched order
 GHOST.CENTER.X METADATA
   NORDER_X S32 3
   NORDER_Y S32 3
-  VAL_X00_Y00  F64 -4.421024e+01
-  VAL_X01_Y00  F64 1.216270e-02
-  VAL_X02_Y00  F64 -9.721643e-08
-  VAL_X03_Y00  F64 9.976554e-11
-  VAL_X00_Y01  F64 -1.762476e-03
-  VAL_X01_Y01  F64 1.247212e-07
-  VAL_X02_Y01  F64 3.629557e-11
-  VAL_X00_Y02  F64 -1.040174e-07
-  VAL_X01_Y02  F64 1.074674e-10
-  VAL_X00_Y03  F64 1.564112e-11
+  VAL_X00_Y00  F64 -1.215661e+02
+  VAL_X01_Y00  F64  1.321875e-02
+  VAL_X02_Y00  F64 -4.017026e-09
+  VAL_X03_Y00  F64  1.148288e-10
+  VAL_X00_Y01  F64 -1.908074e-03
+  VAL_X01_Y01  F64  8.479150e-08
+  VAL_X02_Y01  F64  1.635732e-11
+  VAL_X00_Y02  F64  2.625405e-08
+  VAL_X01_Y02  F64  1.125586e-10
+  VAL_X00_Y03  F64  2.912432e-12
   NELEMENTS  S32 10
 END
@@ -18 +86 @@
   NORDER_X S32 3
   NORDER_Y S32 3
-  VAL_X00_Y00  F64 -2.189470e+00
-  VAL_X01_Y00  F64 -4.186514e-03
-  VAL_X02_Y00  F64 1.131554e-07
-  VAL_X03_Y00  F64 1.415192e-11
-  VAL_X00_Y01  F64 1.569104e-02
-  VAL_X01_Y01  F64 -1.782801e-07
-  VAL_X02_Y01  F64 8.179602e-11
-  VAL_X00_Y02  F64 2.577055e-07
-  VAL_X01_Y02  F64 8.879423e-11
-  VAL_X00_Y03  F64 5.767429e-11
+  VAL_X00_Y00  F64  2.422174e+01
+  VAL_X01_Y00  F64  4.170486e-04
+  VAL_X02_Y00  F64 -1.934260e-08
+  VAL_X03_Y00  F64 -1.173657e-12
+  VAL_X00_Y01  F64  1.189352e-02
+  VAL_X01_Y01  F64 -9.256748e-08
+  VAL_X02_Y01  F64  1.140772e-10
+  VAL_X00_Y02  F64  8.123932e-08
+  VAL_X01_Y02  F64  1.328378e-11
+  VAL_X00_Y03  F64  1.170865e-10
   NELEMENTS  S32 10
 END
 
+
+
+# These are semi-major/minor axes
+# These are my (CZW) quadratic solutions
+# GHOST.INNER.MAJOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 2.2622e+01
+#   VAL_X01  F64 1.3822e-02
+#   VAL_X02  F64 -3.7005e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.INNER.MINOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 4.9626e+01
+#   VAL_X01  F64 -2.4257e-04
+#   VAL_X02  F64 -1.2007e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.OUTER.MAJOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 9.6490e+01
+#   VAL_X01  F64 9.4250e-03
+#   VAL_X02  F64 6.5680e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.OUTER.MINOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 9.5450e+01
+#   VAL_X01  F64 2.8775e-03
+#   VAL_X02  F64 -3.1409e-07
+#   NELEMENTS  S32 3
+# END
+
+# These are the original linear solutions
 GHOST.INNER.MAJOR METADATA
   NORDER_X S32 1