Merge pull request lbl-srg#10 from caryfaulkner/update-codes

Update codes for the ISAT model
caryfaulkner · Jul 16, 2020 · 7445573 · 7445573
2 parents 7668a18 + 6b1f94c
commit 7445573
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 190 deletions.
diff --git a/Buildings/Resources/Library/linux64/libisat.so b/Buildings/Resources/Library/linux64/libisat.so
diff --git a/Buildings/Resources/Library/win32/isat.dll b/Buildings/Resources/Library/win32/isat.dll
diff --git a/Buildings/Resources/Library/win32/isat.lib b/Buildings/Resources/Library/win32/isat.lib
diff --git a/Buildings/Resources/Library/win64/isat.dll b/Buildings/Resources/Library/win64/isat.dll
diff --git a/Buildings/Resources/Library/win64/isat.lib b/Buildings/Resources/Library/win64/isat.lib
diff --git a/...eferenceResults/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_ForcedConvection.txt b/...eferenceResults/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_ForcedConvection.txt
@@ -1,11 +1,11 @@
-last-generated=2020-05-12
+last-generated=2020-07-14
 statistics-simulation=
 {
   "linear": "6",
   "nonlinear": "1",
   "number of continuous time states": "15",
   "numerical Jacobians": "0"
 }
-roo.yCFD[1]=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.942013549804688e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02, 2.953561706542969e+02]
+roo.yCFD[1]=[2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.834421997070312e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.835166625976562e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02, 2.836091613769531e+02]
 time=[0e+00, 6e+02]
-roo.yCFD[2]=[9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.139434993267059e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 9.738373756408691e-02, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01, 1.043862998485565e-01]
+roo.yCFD[2]=[1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 1.569978594779968e-01, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 8.98795947432518e-02, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01, 1.582619696855545e-01]
diff --git a/...Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_ForcedConvectionWithExteriorWall.txt b/...Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_ForcedConvectionWithExteriorWall.txt
@@ -0,0 +1,15 @@
+last-generated=2020-07-14
+statistics-initialization=
+{
+  "linear": "6"
+}
+statistics-simulation=
+{
+  "linear": "6, 0",
+  "nonlinear": "1",
+  "number of continuous time states": "20",
+  "numerical Jacobians": "0"
+}
+roo.yCFD[1]=[2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832108154296875e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02, 2.832119445800781e+02]
+time=[0e+00, 6e+02]
+roo.yCFD[2]=[1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.599463671445847e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01, 1.679600030183792e-01]
diff --git a/...Results/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_MixedConvection.txt b/...Results/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_MixedConvection.txt
@@ -1,8 +1,8 @@
-last-generated=2020-05-12
+last-generated=2020-07-14
 statistics-initialization=
 {
   "linear": "6",
-  "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1",
+  "nonlinear": "1, 1, 1, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/.../Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_MixedConvectionWithBox.txt b/.../Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_MixedConvectionWithBox.txt
@@ -1,8 +1,8 @@
-last-generated=2020-05-12
+last-generated=2020-07-14
 statistics-initialization=
 {
   "linear": "6",
-  "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1",
+  "nonlinear": "1, 1, 1, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...sults/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_NaturalConvection.txt b/...sults/Dymola/Buildings_ThermalZones_Detailed_Examples_ISAT_Tutorial_NaturalConvection.txt
@@ -1,8 +1,8 @@
-last-generated=2020-05-12
+last-generated=2020-07-14
 statistics-initialization=
 {
   "linear": "6",
-  "nonlinear": "1, 1, 1, 1, 1, 1, 1, 1",
+  "nonlinear": "1, 1, 1, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...reVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos b/...reVars/Buildings.ThermalZones.Detailed.Examples.ISAT.ForcedConvectionWithExteriorWall.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "roo.yCFD[1]",
+    "roo.yCFD[2]"
+  };