Merge pull request #1 from RWTH-EBC/PGorzalka_issue1080_ROM-soil-and-…

…zone-borders Merge changes in CI branch
RWTH-EBC · Dec 12, 2024 · 027e139 · 027e139
2 parents 4430847 + 3d9a06e
commit 027e139
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/...ults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneInterzonalsFixedHeater.txt b/...ults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneInterzonalsFixedHeater.txt
@@ -0,0 +1,16 @@
+last-generated=2024-12-11
+statistics-initialization=
+{
+  "linear": "21"
+}
+statistics-simulation=
+{
+  "linear": "5, 0, 0, 7, 6, 0, 0, 0",
+  "nonlinear": "1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1",
+  "number of continuous time states": "23",
+  "numerical Jacobians": "0"
+}
+time=[1.4976e+06, 5.1552e+06]
+multizone.TAir[1]=[2.931499938964844e+02, 2.776483703613281e+02, 2.774831726074219e+02, 2.773951477050781e+02, 2.773399841308594e+02, 2.7730029296875e+02, 2.772690551757813e+02, 2.772432250976562e+02, 2.772213439941406e+02, 2.772026062011719e+02, 2.771865234375e+02, 2.771726379394531e+02, 2.7716064453125e+02, 2.771503295898438e+02, 2.771413879394531e+02, 2.771336975097656e+02, 2.771270751953125e+02, 2.77121337890625e+02, 2.771163940429688e+02, 2.771121215820312e+02, 2.771084289550781e+02, 2.771052551269531e+02, 2.771025085449219e+02, 2.771001586914062e+02, 2.770981140136719e+02, 2.770963439941406e+02, 2.770948181152344e+02, 2.77093505859375e+02, 2.770923767089844e+02, 2.770914001464844e+02, 2.770905456542969e+02, 2.7708984375e+02, 2.770892028808594e+02, 2.770886535644531e+02, 2.770881958007812e+02, 2.770877990722656e+02, 2.770874328613281e+02, 2.770871276855469e+02, 2.770868835449219e+02, 2.77086669921875e+02, 2.770864562988281e+02, 2.770416381835938e+02, 2.764381103515625e+02, 2.778193115234375e+02, 2.751711669921875e+02, 2.741619567871094e+02, 2.801908569335938e+02, 2.810903259277344e+02, 2.84857373046875e+02, 2.790746826171875e+02, 2.837751770019531e+02, 2.825350708007812e+02, 2.808518371582031e+02, 2.830671081542969e+02, 2.814529113769531e+02, 2.827593078613281e+02, 2.782101623535156e+02, 2.798267822265625e+02, 2.770711975097656e+02, 2.747296813964844e+02, 2.811123657226562e+02, 2.760388549804687e+02, 2.845586181640625e+02, 2.758261962890625e+02, 2.762576171875e+02, 2.7896435546875e+02, 2.73739111328125e+02, 2.896677795410156e+02, 2.755034301757813e+02, 2.883624755859375e+02, 2.791798400878906e+02, 2.783431335449219e+02, 2.855335144042969e+02, 2.767149230957031e+02, 2.927081665039062e+02, 2.834747924804688e+02, 2.854232116699219e+02, 2.792185424804687e+02, 2.767677307128906e+02, 2.84028466796875e+02, 2.798180236816406e+02, 2.87235693359375e+02, 2.837477294921875e+02, 2.819183227539062e+02, 2.797656005859375e+02, 2.764566345214844e+02, 2.833866149902344e+02, 2.7448623046875e+02, 2.888609191894531e+02, 2.786039245605469e+02, 2.803387451171875e+02, 2.820953002929688e+02, 2.754931518554687e+02, 2.937669555664062e+02, 2.7650390625e+02, 2.854951782226562e+02, 2.857708190917969e+02, 2.858793701171875e+02, 2.859237060546875e+02, 2.859429016113281e+02, 2.859520568847656e+02]
+multizone.TAir[2]=[2.931499938964844e+02, 2.832138427734375e+02, 2.816444641113281e+02, 2.806274230957031e+02, 2.799275817871094e+02, 2.794205627441406e+02, 2.790360778808594e+02, 2.78733349609375e+02, 2.784880187988281e+02, 2.782850708007812e+02, 2.781147155761719e+02, 2.779703491210938e+02, 2.778471923828125e+02, 2.777417358398437e+02, 2.776511413574219e+02, 2.775732116699219e+02, 2.775060852050781e+02, 2.774482360839844e+02, 2.773983520507812e+02, 2.773553344726562e+02, 2.773182067871094e+02, 2.772861938476562e+02, 2.772585754394531e+02, 2.77234716796875e+02, 2.772141418457031e+02, 2.771964111328125e+02, 2.771810913085938e+02, 2.771678771972656e+02, 2.771564636230469e+02, 2.771466064453125e+02, 2.771381225585938e+02, 2.771307983398438e+02, 2.771244750976563e+02, 2.771190185546875e+02, 2.771142883300781e+02, 2.771102294921875e+02, 2.771067199707031e+02, 2.771036987304688e+02, 2.7710107421875e+02, 2.770988464355469e+02, 2.770968933105469e+02, 2.770925720214844e+02, 2.770214233398438e+02, 2.770983703613281e+02, 2.772776428222656e+02, 2.774904479980469e+02, 2.795910583496094e+02, 2.806746826171875e+02, 2.821609619140625e+02, 2.823667419433594e+02, 2.833232116699219e+02, 2.841150817871094e+02, 2.844910095214844e+02, 2.853317565917969e+02, 2.854371765136719e+02, 2.859168090820312e+02, 2.853811218261719e+02, 2.854762451171875e+02, 2.855161315917969e+02, 2.849033142089844e+02, 2.858678894042969e+02, 2.85266748046875e+02, 2.860969848632812e+02, 2.853794677734375e+02, 2.849525512695312e+02, 2.86215576171875e+02, 2.852497497558594e+02, 2.878989501953125e+02, 2.859811767578125e+02, 2.873267517089844e+02, 2.867687072753906e+02, 2.859102355957031e+02, 2.875119140625e+02, 2.857005676269531e+02, 2.873546264648438e+02, 2.860965576171875e+02, 2.85667578125e+02, 2.848749267578125e+02, 2.836799621582031e+02, 2.848315246582031e+02, 2.837822265625e+02, 2.845549499511719e+02, 2.842535095214844e+02, 2.839054870605469e+02, 2.836509521484375e+02, 2.825057983398438e+02, 2.834811584472656e+02, 2.819665649414063e+02, 2.833889465332031e+02, 2.824202453613281e+02, 2.820346984863281e+02, 2.832013732910156e+02, 2.817672241210938e+02, 2.84672509765625e+02, 2.822912719726563e+02, 2.830803833007812e+02, 2.833678039550781e+02, 2.835470031738281e+02, 2.836628967285156e+02, 2.837400024414063e+02, 2.83793701171875e+02]
+multizone.TAir[3]=[2.931499938964844e+02, 2.880093872070312e+02, 2.865355407714844e+02, 2.852514038085938e+02, 2.841321228027344e+02, 2.831589050292969e+02, 2.823147216796875e+02, 2.815837341308594e+02, 2.80951513671875e+02, 2.804051940917969e+02, 2.799333190917969e+02, 2.795259155273437e+02, 2.791742065429688e+02, 2.788706176757813e+02, 2.786086181640625e+02, 2.783824768066406e+02, 2.781873413085938e+02, 2.780189453125e+02, 2.778736328125e+02, 2.777482177734375e+02, 2.776400146484375e+02, 2.775466125488281e+02, 2.774660278320313e+02, 2.773964904785156e+02, 2.77336474609375e+02, 2.772846984863281e+02, 2.772400024414063e+02, 2.772014404296875e+02, 2.771681518554688e+02, 2.771394348144531e+02, 2.771146545410156e+02, 2.770932739257813e+02, 2.770748291015625e+02, 2.770588989257812e+02, 2.77045166015625e+02, 2.770332946777344e+02, 2.770230712890625e+02, 2.770142211914062e+02, 2.770066223144531e+02, 2.770000305175781e+02, 2.769943542480469e+02, 2.83056787109375e+02, 2.77188134765625e+02, 2.771993225097656e+02, 2.875411926269531e+02, 2.905169067382812e+02, 2.940538940429688e+02, 2.960769470214844e+02, 2.987372741699219e+02, 2.997654968261719e+02, 3.013921203613281e+02, 3.024123657226563e+02, 3.028252136230469e+02, 3.047309387207031e+02, 3.050744750976563e+02, 3.055519714355469e+02, 3.054293212890625e+02, 3.054365051269531e+02, 3.051890686035156e+02, 3.0525234375e+02, 3.057091674804688e+02, 3.054366943359375e+02, 3.054748962402344e+02, 3.052482055664062e+02, 3.048393005371094e+02, 3.050394287109375e+02, 3.048533630371094e+02, 3.060232421875e+02, 3.054666564941406e+02, 3.060363586425781e+02, 3.058592224121094e+02, 2.983937805175781e+02, 2.976009826660156e+02, 2.95025927734375e+02, 2.947136413574219e+02, 2.930430297851562e+02, 2.926514465332031e+02, 2.911318969726562e+02, 2.894678955078125e+02, 2.895965026855469e+02, 2.882412109375e+02, 2.881846496582031e+02, 2.876080322265625e+02, 2.870525512695312e+02, 2.868290832519531e+02, 2.856758422851562e+02, 2.862407043457031e+02, 2.850028869628906e+02, 2.857413513183594e+02, 2.849529968261719e+02, 2.84819091796875e+02, 2.853792236328125e+02, 2.844055236816406e+02, 2.859579528808594e+02, 2.8503984375e+02, 2.843811950683594e+02, 2.843991088867188e+02, 2.844956420898437e+02, 2.846020751953125e+02, 2.847010925292969e+02, 2.847890625e+02]
diff --git a/...eferenceResults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneMoistAirCO2.txt b/...eferenceResults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneMoistAirCO2.txt
@@ -1,11 +1,11 @@
-last-generated=2022-06-07
+last-generated=2024-12-11
 statistics-initialization=
 {
   "linear": "5, 5, 5, 5, 5"
 }
 statistics-simulation=
 {
-  "linear": "4, 0, 4, 0, 4, 0, 4, 0, 4, 0",
+  "linear": "3, 0, 3, 0, 3, 0, 3, 0, 3, 0",
   "nonlinear": "0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,   1, 0, 1",
   "number of continuous time states": "45",
   "numerical Jacobians": "0"

diff --git a/...ces/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/MultizoneInterzonalsFixedHeater.mos b/...ces/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/MultizoneInterzonalsFixedHeater.mos
@@ -1,10 +1,4 @@
-simulateModel(
-  "AixLib.ThermalZones.ReducedOrder.Examples.MultizoneInterzonalsFixedHeater",
-  startTime=1497600,
-  stopTime=5155200,
-  numberOfIntervals=1016,
-  method="Radau",
-  resultFile="MultizoneInterzonalsFixedHeater");
+simulateModel("AixLib.ThermalZones.ReducedOrder.Examples.MultizoneInterzonalsFixedHeater", startTime=1497600, stopTime=5155200, numberOfIntervals=1016, method="CVode", resultFile="MultizoneInterzonalsFixedHeater");
 createPlot(id=1, 
   position={16, 15, 584, 361}, 
   x="time",
@@ -14,4 +8,3 @@ createPlot(id=1,
   colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
   timeUnit="s", 
   displayUnits={"degC", "degC", "degC"});
-
diff --git a/AixLib/ThermalZones/ReducedOrder/Examples/MultizoneInterzonalsFixedHeater.mo b/AixLib/ThermalZones/ReducedOrder/Examples/MultizoneInterzonalsFixedHeater.mo
@@ -144,6 +144,7 @@ equation
   annotation (experiment(
       StartTime=1497600,
       StopTime=5155200,
+	  Tolerance=1e-6,
       Interval=3600),
       __Dymola_Commands(file="Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/MultizoneInterzonalsFixedHeater.mos"
         "Simulate and plot"),