diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98f8c7cc93..bd917fe214 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: project: 'EBC/EBC_all/gitlab_ci/templates' - ref: AixLibCI + ref: AixLibCI2024 file: 'modelica-ci-tests/scripts/.gitlab-ci.yml' diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt index 1365fa4dcd..f94071ebdd 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt @@ -1,7 +1,7 @@ last-generated=2024-07-23 statistics-initialization= { - "nonlinear": "0, 16, 1", + "nonlinear": "1, 16, 1", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt index 3b6ba2a343..9ae5c3fcb7 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt @@ -1,7 +1,7 @@ last-generated=2024-07-23 statistics-initialization= { - "nonlinear": "0, 17, 1", + "nonlinear": "1, 17, 1", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt index 2a3f29f9ee..79e6769e4c 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt @@ -1,7 +1,7 @@ last-generated=2024-07-24 statistics-initialization= { - "nonlinear": "3, 0", + "nonlinear": "4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt index a024d33bed..362db6ffa0 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt @@ -1,20 +1,20 @@ -last-generated=2024-07-25 +last-generated=2024-11-29 statistics-initialization= { "linear": "4, 0", - "nonlinear": "4, 0, 4, 0, 3, 0, 0, 1, 0, 1, 0, 0, 0, 0", + "nonlinear": "4, 0, 3, 0, 3, 0, 0, 1, 0, 0, 0, 0, 1, 0", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", - "nonlinear": "0, 1, 1, 0, 0, 0, 0, 0, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0", + "nonlinear": "0, 0, 0, 1, 0, 0, 0, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1", "number of continuous time states": "272", "numerical Jacobians": "0" } time=[5.9616e+06, 6.5664e+06] -genericAHU.genericAHUBus.TSupMea=[3.031499938964844e+02, 2.931525085449219e+02, 2.931464233398438e+02, 2.931482971191406e+02, 2.931467529296875e+02, 2.931530151367188e+02, 2.931550659179687e+02, 2.931567687988281e+02, 2.931459167480469e+02, 2.931519653320312e+02, 2.931468200683594e+02, 2.931435424804687e+02, 2.931444396972656e+02, 2.931422302246094e+02, 2.93148095703125e+02, 2.931452941894531e+02, 2.9314453125e+02, 2.931453063964844e+02, 2.931523559570313e+02, 2.931512451171875e+02, 2.921061401367188e+02, 2.932062805175781e+02, 2.931635620117187e+02, 2.930996276855469e+02, 2.931445251464844e+02, 2.931529541015625e+02, 2.931467529296875e+02, 2.931463195800781e+02, 2.931401916503906e+02, 2.931448791503906e+02, 2.931481628417969e+02, 2.931456909179688e+02, 2.931497131347656e+02, 2.931717468261719e+02, 2.931677978515625e+02, 2.931574096679688e+02, 2.929947204589844e+02, 2.929675903320312e+02, 2.931598510742188e+02, 2.930356140136719e+02, 2.931483154296875e+02, 2.931512390136719e+02, 2.931463256835938e+02, 2.931496398925781e+02, 2.931450256347656e+02, 2.931466674804688e+02, 2.931465270996094e+02, 2.931481689453125e+02, 2.931563903808594e+02, 2.931296508789063e+02, 2.931705322265625e+02, 2.931882568359375e+02, 2.93135791015625e+02, 2.937101745605469e+02, 2.931428039550781e+02, 2.931470642089844e+02, 2.931428833007812e+02, 2.931418640136719e+02, 2.931496643066406e+02, 2.931432250976562e+02, 2.931478881835938e+02, 2.931449157714844e+02, 2.931734802246094e+02, 2.932702270507813e+02, 2.932194702148437e+02, 2.931085510253906e+02, 2.934374084472656e+02, 2.931758850097656e+02, 2.925652587890625e+02, 2.931372497558594e+02, 2.931415710449219e+02, 2.931428100585937e+02, 2.931434997558594e+02, 2.931406616210937e+02, 2.931445495605469e+02, 2.931371154785156e+02, 2.931534790039062e+02, 2.931725402832031e+02, 2.941346862792969e+02, 2.931924743652344e+02, 2.931701049804688e+02, 2.938579528808594e+02, 2.931154418945313e+02, 2.931359436035156e+02, 2.931460510253906e+02, 2.931474304199219e+02, 2.931450866699219e+02, 2.931465209960937e+02, 2.931467041015625e+02, 2.931476928710937e+02, 2.931481018066406e+02, 2.93150537109375e+02, 2.931482238769531e+02, 2.931499145507813e+02, 2.931501037597656e+02, 2.931523742675781e+02, 2.931496887207031e+02, 2.931495910644531e+02, 2.93150537109375e+02, 2.931531494140625e+02, 2.931556396484375e+02] -genericAHU.genericAHUBus.TOdaMea=[3.031499938964844e+02, 2.816510437011719e+02, 2.812721008300781e+02, 2.810447387695312e+02, 2.806353942871094e+02, 2.806245727539062e+02, 2.813888671875e+02, 2.823677001953125e+02, 2.825362915039062e+02, 2.827453186035156e+02, 2.824911193847656e+02, 2.819651428222656e+02, 2.811151550292969e+02, 2.794293579101562e+02, 2.794889770507813e+02, 2.785244445800781e+02, 2.781871215820312e+02, 2.778995727539062e+02, 2.785819702148438e+02, 2.786313537597656e+02, 2.820504760742188e+02, 2.853292114257812e+02, 2.864217895507812e+02, 2.868355102539062e+02, 2.87213037109375e+02, 2.875488891601562e+02, 2.866647033691406e+02, 2.85530322265625e+02, 2.847202209472656e+02, 2.835629028320312e+02, 2.836711120605469e+02, 2.83335107421875e+02, 2.831687866210938e+02, 2.828631103515625e+02, 2.837184204101562e+02, 2.843091125488281e+02, 2.845592834472656e+02, 2.850676513671875e+02, 2.853401550292969e+02, 2.850943969726562e+02, 2.850019836425781e+02, 2.846758361816406e+02, 2.832384338378906e+02, 2.834480712890625e+02, 2.830691284179687e+02, 2.827716674804688e+02, 2.823108764648438e+02, 2.821388366699219e+02, 2.826403381347656e+02, 2.829925048828125e+02, 2.836463317871094e+02, 2.854063049316406e+02, 2.854196472167969e+02, 2.856457336425781e+02, 2.847413879394531e+02, 2.841886291503906e+02, 2.836947021484375e+02, 2.82323583984375e+02, 2.812730895996094e+02, 2.804439819335938e+02, 2.803667907714844e+02, 2.803451293945312e+02, 2.806056823730469e+02, 2.844159973144531e+02, 2.878858947753906e+02, 2.906085510253906e+02, 2.91112646484375e+02, 2.911349182128906e+02, 2.89287939453125e+02, 2.874098022460938e+02, 2.862945861816406e+02, 2.850127746582031e+02, 2.841727661132812e+02, 2.828424438476562e+02, 2.819891967773438e+02, 2.80355224609375e+02, 2.796067687988281e+02, 2.81635107421875e+02, 2.834853271484375e+02, 2.859810302734375e+02, 2.873733520507812e+02, 2.854789916992187e+02, 2.835642944335938e+02, 2.810159118652344e+02, 2.804072143554687e+02, 2.799130249023438e+02, 2.791451416015625e+02, 2.786036560058594e+02, 2.78099658203125e+02, 2.778919067382812e+02, 2.775111083984375e+02, 2.773408386230469e+02, 2.774520690917969e+02, 2.776192810058594e+02, 2.78026513671875e+02, 2.786343688964844e+02, 2.789421203613281e+02, 2.788549865722656e+02, 2.782231201171875e+02, 2.780323059082031e+02, 2.794450073242188e+02] -genericAHU.genericAHUBus.heaterBus.hydraulicBus.valveSet=[0e+00, 4.353749930858612e-01, 4.389260828495026e-01, 4.417324483394623e-01, 4.44546240568161e-01, 4.462419152259827e-01, 4.409913957118988e-01, 4.309958875179291e-01, 4.287210881710052e-01, 4.296214699745178e-01, 4.315162599086761e-01, 4.358306348323822e-01, 4.424919962882995e-01, 4.535297989845276e-01, 4.554321706295014e-01, 4.616130888462067e-01, 4.642196297645569e-01, 4.67069810628891e-01, 4.649906098842621e-01, 4.523712992668152e-01, 5.981433391571045e-01, 5.182182550430298e-01, 3.897131383419037e-01, 5.016682386398316e-01, 4.30000239610672e-01, 3.724558353424072e-01, 3.9695925116539e-01, 4.078249037265778e-01, 4.135084748268127e-01, 4.25180983543396e-01, 4.256089925765991e-01, 4.287417471408844e-01, 4.325169086456299e-01, 4.219634473323822e-01, 4.093535721302032e-01, 5.763819217681885e-01, 4.082461893558502e-01, 5.547938466072082e-01, 5.160202503204345e-01, 3.978763103485107e-01, 4.126027822494507e-01, 4.167377293109894e-01, 4.283762633800506e-01, 4.281341671943665e-01, 4.316097915172577e-01, 4.347160160541534e-01, 4.39115959405899e-01, 4.412565290927887e-01, 4.179922342300415e-01, 6.051241755485535e-01, 5.467936992645264e-01, 4.673546135425568e-01, 5.130228161811828e-01, 4.384145379066468e-01, 4.129826486110687e-01, 4.188401699066162e-01, 4.228028237819672e-01, 4.342906534671783e-01, 4.437309861183166e-01, 4.484700560569763e-01, 4.500316679477692e-01, 4.501384377479553e-01, 4.37259715795517e-01, 5.771345853805542e-01, 4.544011235237121e-01, 3.392685353755951e-01, 1.881531178951263e-01, 8.703893721103668e-02, 3.438824355602265e-01, 3.772744297981262e-01, 3.894599080085754e-01, 4.008763551712036e-01, 4.084188997745514e-01, 4.184819400310517e-01, 4.263796389102936e-01, 4.376241266727448e-01, 4.313414990901947e-01, 4.103860318660736e-01, 5.424436569213867e-01, 3.802259087562561e-01, 4.57478791475296e-01, 4.35078102350235e-01, 3.856487691402435e-01, 4.223862588405609e-01, 4.298744082450867e-01, 4.352738857269287e-01, 4.410141527652741e-01, 4.460964202880859e-01, 4.50242692232132e-01, 4.523450791835785e-01, 4.537136852741241e-01, 4.543777704238892e-01, 4.557966649532318e-01, 4.569764077663422e-01, 4.582026302814484e-01, 4.568041861057281e-01, 4.55569738149643e-01, 4.57279235124588e-01, 4.612696826457977e-01, 4.632321655750274e-01, 4.577629268169403e-01] -genericAHU.genericAHUBus.heaterBus.VFlowAirMea=[0e+00, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.301835417747498e-01, 5.449817538261413e-01, 1.840522557497025e-01, 7.11042070388794e-01, 3.58930641412735e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.112767696380615e-01, 1.839792758226395e-01, 7.446747422218323e-01, 5.359786629676819e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.118768811225891e-01, 5.360565185546875e-01, 3.598538041114807e-01, 5.230319380760193e-01, 1.670225977897644e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.275366663932801e-01, 5.39739453792572e-01, 3.63675057888031e-01, 7.059062957763672e-01, 3.598480343818665e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 5.278637528419494e-01, 1.840484768152237e-01, 7.397847771644592e-01, 3.954299688339233e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01] -thermalZone.CO2Con=[4e+02, 4.200032592773438e+02, 4.345891845703125e+02, 4.420400817871094e+02, 4.458450256347656e+02, 4.477870178222656e+02, 4.487790954589844e+02, 4.492855712890625e+02, 4.49544140625e+02, 4.496761779785156e+02, 4.497435913085938e+02, 4.497779846191406e+02, 4.497955444335938e+02, 4.498045288085938e+02, 4.498091186523437e+02, 4.498114318847656e+02, 4.498126342773438e+02, 4.498132568359375e+02, 4.498135681152344e+02, 5.226792846679688e+02, 8.998889770507812e+02, 9.000609130859375e+02, 9e+02, 8.99948876953125e+02, 8.999955444335938e+02, 8.290685424804688e+02, 6.434911254882812e+02, 5.487060424804688e+02, 5.00308251953125e+02, 4.756022521972656e+02, 4.629825439453125e+02, 4.565390930175781e+02, 4.53247607421875e+02, 4.897243774414063e+02, 7.791283569335938e+02, 9.000065307617188e+02, 8.999966674804688e+02, 9.001863525390625e+02, 8.999999755859375e+02, 8.59250537109375e+02, 6.84522705078125e+02, 5.696478881835938e+02, 5.10993896484375e+02, 4.81053076171875e+02, 4.657656860351562e+02, 4.579599609375e+02, 4.539727966308594e+02, 4.519380859375e+02, 6.717307495117187e+02, 8.999711791992188e+02, 9e+02, 9.000000610351562e+02, 9.000001586914062e+02, 8.958544189453125e+02, 7.341894409179688e+02, 5.949932861328125e+02, 5.239372436523438e+02, 4.876567016601563e+02, 4.69137109375e+02, 4.596778076171875e+02, 4.548511352539062e+02, 4.523864990234375e+02, 5.681602905273437e+02, 9.000591674804688e+02, 9.000090087890625e+02, 9.00029052734375e+02, 8.999982055664062e+02, 8.999997924804687e+02, 7.94417529296875e+02, 6.2571728515625e+02, 5.396390380859375e+02, 4.957082885742187e+02, 4.732465515136719e+02, 4.617792297363281e+02, 4.559232482910156e+02, 4.529327392578125e+02, 5.077596740722656e+02, 8.57424853515625e+02, 9.00306396484375e+02, 8.999998291015625e+02, 8.999732666015625e+02, 8.99992578125e+02, 8.43434619140625e+02, 6.629959350585938e+02, 5.586784423828125e+02, 5.053997497558594e+02, 4.781988586425781e+02, 4.643093383789063e+02, 4.572218505859375e+02, 4.53594677734375e+02, 4.517444458007812e+02, 4.508002502441406e+02, 4.503176025390625e+02, 4.500711303710938e+02, 4.499452453613281e+02, 4.498809814453125e+02, 4.498481750488281e+02, 4.498314086914062e+02, 4.498228515625e+02, 4.498184448242188e+02, 4.498162231445312e+02] +genericAHU.genericAHUBus.TSupMea=[3.031499938964844e+02, 2.931513610839844e+02, 2.931464721679687e+02, 2.931487426757812e+02, 2.931464233398438e+02, 2.931540832519531e+02, 2.931553100585937e+02, 2.931575927734375e+02, 2.93144189453125e+02, 2.931522338867188e+02, 2.931467895507812e+02, 2.931437133789062e+02, 2.931439208984375e+02, 2.931422790527344e+02, 2.931481750488281e+02, 2.931453857421875e+02, 2.931445190429687e+02, 2.931453186035156e+02, 2.931519897460938e+02, 2.931513854980469e+02, 2.921058959960938e+02, 2.932059143066406e+02, 2.931631591796875e+02, 2.930998901367187e+02, 2.931451782226562e+02, 2.93154052734375e+02, 2.931461486816406e+02, 2.931452514648437e+02, 2.931400329589844e+02, 2.931450561523437e+02, 2.931476745605469e+02, 2.931463806152344e+02, 2.931491394042969e+02, 2.9317236328125e+02, 2.931682861328125e+02, 2.931575317382812e+02, 2.92993896484375e+02, 2.929675842285156e+02, 2.931596557617187e+02, 2.930355102539062e+02, 2.931477355957031e+02, 2.931522583007812e+02, 2.931473693847656e+02, 2.931489135742187e+02, 2.931456970214844e+02, 2.931456298828125e+02, 2.931468322753906e+02, 2.931477905273438e+02, 2.931553955078125e+02, 2.931307800292969e+02, 2.931703491210938e+02, 2.931881591796875e+02, 2.931360412597656e+02, 2.937102416992187e+02, 2.931424133300781e+02, 2.9314697265625e+02, 2.931428649902344e+02, 2.931419677734375e+02, 2.931490783691406e+02, 2.931436584472656e+02, 2.931478881835938e+02, 2.931447998046875e+02, 2.931738525390625e+02, 2.932702697753906e+02, 2.932185974121094e+02, 2.93108642578125e+02, 2.934373291015625e+02, 2.931752380371094e+02, 2.925704528808594e+02, 2.931384521484375e+02, 2.93141845703125e+02, 2.931425903320313e+02, 2.931439270019531e+02, 2.931409973144531e+02, 2.93144091796875e+02, 2.931370239257812e+02, 2.931525207519531e+02, 2.931727966308594e+02, 2.94134619140625e+02, 2.93190283203125e+02, 2.93168701171875e+02, 2.938573486328125e+02, 2.93115576171875e+02, 2.931353881835938e+02, 2.931460876464844e+02, 2.931474304199219e+02, 2.93144970703125e+02, 2.931460998535156e+02, 2.9314658203125e+02, 2.93148486328125e+02, 2.931465454101562e+02, 2.931472961425781e+02, 2.931455200195313e+02, 2.931464538574219e+02, 2.931490051269531e+02, 2.931522827148438e+02, 2.9314580078125e+02, 2.93147314453125e+02, 2.931472412109375e+02, 2.931528442382813e+02, 2.931561889648438e+02] +genericAHU.genericAHUBus.TOdaMea=[3.031499938964844e+02, 2.816510437011719e+02, 2.812721008300781e+02, 2.810447387695312e+02, 2.806354125976562e+02, 2.806245727539062e+02, 2.813888793945313e+02, 2.823677001953125e+02, 2.825362915039062e+02, 2.827453186035156e+02, 2.824911193847656e+02, 2.819651428222656e+02, 2.811151000976562e+02, 2.794293579101562e+02, 2.794889770507813e+02, 2.785244445800781e+02, 2.781871215820312e+02, 2.778995727539062e+02, 2.785819702148438e+02, 2.786312438964844e+02, 2.820504760742188e+02, 2.853292114257812e+02, 2.864217895507812e+02, 2.868355102539062e+02, 2.87213037109375e+02, 2.875488891601562e+02, 2.86664697265625e+02, 2.855303466796875e+02, 2.847202209472656e+02, 2.835629028320312e+02, 2.836711120605469e+02, 2.83335107421875e+02, 2.831687805175781e+02, 2.828631103515625e+02, 2.837184204101562e+02, 2.843091125488281e+02, 2.845592834472656e+02, 2.850676513671875e+02, 2.853401550292969e+02, 2.850944091796875e+02, 2.850020141601562e+02, 2.846758056640625e+02, 2.832384338378906e+02, 2.834480163574219e+02, 2.830691284179687e+02, 2.827716674804688e+02, 2.823108764648438e+02, 2.821388854980469e+02, 2.826403381347656e+02, 2.829925048828125e+02, 2.836463317871094e+02, 2.854063110351562e+02, 2.854196472167969e+02, 2.856457336425781e+02, 2.847413879394531e+02, 2.841886291503906e+02, 2.836947814941406e+02, 2.82323583984375e+02, 2.812730773925781e+02, 2.804440002441406e+02, 2.803667907714844e+02, 2.803451293945312e+02, 2.806056823730469e+02, 2.844159973144531e+02, 2.878858947753906e+02, 2.906085510253906e+02, 2.91112646484375e+02, 2.911348999023438e+02, 2.89287939453125e+02, 2.874098022460938e+02, 2.862945861816406e+02, 2.850127746582031e+02, 2.841727661132812e+02, 2.828424438476562e+02, 2.819891967773438e+02, 2.803551940917969e+02, 2.796067565917969e+02, 2.81635107421875e+02, 2.834853271484375e+02, 2.859810302734375e+02, 2.873733520507812e+02, 2.854789916992187e+02, 2.835642944335938e+02, 2.810158996582031e+02, 2.804072448730469e+02, 2.799129943847656e+02, 2.791451416015625e+02, 2.786036560058594e+02, 2.78099658203125e+02, 2.778919067382812e+02, 2.775111083984375e+02, 2.773408386230469e+02, 2.774520935058594e+02, 2.776192504882812e+02, 2.780265014648438e+02, 2.786343688964844e+02, 2.789421325683594e+02, 2.78854931640625e+02, 2.782231201171875e+02, 2.780322937011719e+02, 2.794450073242188e+02] +genericAHU.genericAHUBus.heaterBus.hydraulicBus.valveSet=[0e+00, 4.35428237915039e-01, 4.389388024806976e-01, 4.417110085487366e-01, 4.445550620555878e-01, 4.462155401706696e-01, 4.409953415393829e-01, 4.309882819652557e-01, 4.287951529026032e-01, 4.29589718580246e-01, 4.315359890460968e-01, 4.358314692974091e-01, 4.42539519071579e-01, 4.535296142101288e-01, 4.554179966449737e-01, 4.616152346134186e-01, 4.642228126525879e-01, 4.670921623706817e-01, 4.650251626968384e-01, 4.523757696151733e-01, 5.981448292732239e-01, 5.181869149208069e-01, 3.897317886352539e-01, 5.016412734985352e-01, 4.299834847450256e-01, 3.723132014274597e-01, 3.969773650169373e-01, 4.078996837139129e-01, 4.135087728500366e-01, 4.251687407493591e-01, 4.255870282649994e-01, 4.286885559558868e-01, 4.325514018535614e-01, 4.218694686889649e-01, 4.093450129032135e-01, 5.763927102088928e-01, 4.083408236503601e-01, 5.54804515838623e-01, 5.159986972808838e-01, 3.978360295295715e-01, 4.126240015029907e-01, 4.166808724403381e-01, 4.283713519573212e-01, 4.281318068504333e-01, 4.316331684589386e-01, 4.347551763057709e-01, 4.391154766082764e-01, 4.412636816501617e-01, 4.180009722709656e-01, 6.050907492637634e-01, 5.467838644981384e-01, 4.673655152320862e-01, 5.130168318748474e-01, 4.383996665477753e-01, 4.13019335269928e-01, 4.188370406627655e-01, 4.228086888790131e-01, 4.342774391174317e-01, 4.437202513217926e-01, 4.484507918357849e-01, 4.500108957290649e-01, 4.501447260379791e-01, 4.372995376586914e-01, 5.770877361297607e-01, 4.544240891933441e-01, 3.392700254917145e-01, 1.881355971097946e-01, 8.704601526260376e-02, 3.438700556755066e-01, 3.771858930587769e-01, 3.894601464271545e-01, 4.008760333061218e-01, 4.083984076976776e-01, 4.184351801872254e-01, 4.264019846916199e-01, 4.376378059387207e-01, 4.313865482807159e-01, 4.10325562953949e-01, 5.424433946609497e-01, 3.802657783031463e-01, 4.57523375749588e-01, 4.350778460502625e-01, 3.856845200061798e-01, 4.223906815052033e-01, 4.298843324184418e-01, 4.352785646915436e-01, 4.410168588161468e-01, 4.460739612579346e-01, 4.503008246421814e-01, 4.522852241992951e-01, 4.537097215652466e-01, 4.543342053890228e-01, 4.558703362941742e-01, 4.570399165153504e-01, 4.583984136581421e-01, 4.567659199237823e-01, 4.556710124015808e-01, 4.573854267597198e-01, 4.61373770236969e-01, 4.632332026958466e-01, 4.577146768569946e-01] +genericAHU.genericAHUBus.heaterBus.VFlowAirMea=[0e+00, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.30267345905304e-01, 5.450042128562927e-01, 1.840522527694702e-01, 7.107695460319519e-01, 3.593951940536499e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.108238339424133e-01, 1.839794635772705e-01, 7.446344256401062e-01, 5.360458612442016e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.125441551208496e-01, 5.360564589500427e-01, 3.598538517951965e-01, 5.231502532958985e-01, 1.670235574245453e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 7.290459513664246e-01, 5.390288352966308e-01, 3.635371029376984e-01, 7.063421726226806e-01, 3.598481953144074e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 5.278942883014679e-01, 1.840484321117401e-01, 7.400333285331726e-01, 3.954299688339233e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01, 1.666666716337204e-01] +thermalZone.CO2Con=[4e+02, 4.200034057617187e+02, 4.345962097167969e+02, 4.420445922851562e+02, 4.458464538574219e+02, 4.477885437011719e+02, 4.487795349121094e+02, 4.492857849121094e+02, 4.49544140625e+02, 4.496761474609375e+02, 4.497435302734375e+02, 4.497779663085938e+02, 4.497955444335938e+02, 4.498045288085938e+02, 4.498091186523437e+02, 4.498114318847656e+02, 4.498126342773438e+02, 4.498132568359375e+02, 4.498135681152344e+02, 5.22691552734375e+02, 8.9988818359375e+02, 9.000617553710938e+02, 9e+02, 8.999500610351563e+02, 8.999952514648437e+02, 8.290819091796875e+02, 6.43505517578125e+02, 5.487264770507812e+02, 5.003245300292969e+02, 4.756060791015625e+02, 4.629908447265625e+02, 4.565426086425781e+02, 4.53251025390625e+02, 4.897273132324219e+02, 7.791456420898437e+02, 9.000087890625e+02, 8.999966674804688e+02, 9.0018583984375e+02, 8.99999951171875e+02, 8.59252001953125e+02, 6.845161743164062e+02, 5.696689086914063e+02, 5.110103393554688e+02, 4.810577575683594e+02, 4.657733703613281e+02, 4.579632263183594e+02, 4.539745361328125e+02, 4.519395568847656e+02, 6.716809936523438e+02, 8.999717895507813e+02, 9e+02, 9.000000610351562e+02, 9.0000029296875e+02, 8.958543579101563e+02, 7.34188134765625e+02, 5.94984619140625e+02, 5.239493408203125e+02, 4.876689819335937e+02, 4.691479064941406e+02, 4.596834838867188e+02, 4.54854736328125e+02, 4.523887939453125e+02, 5.682116943359375e+02, 9.000545166015625e+02, 9.000083862304688e+02, 9.000289916992188e+02, 8.999980224609375e+02, 8.999997924804687e+02, 7.944189086914063e+02, 6.257327880859375e+02, 5.396600952148438e+02, 4.956893859863281e+02, 4.732404296875e+02, 4.617781066894531e+02, 4.559220275878906e+02, 4.529328002929688e+02, 5.077606140136719e+02, 8.573949584960938e+02, 9.003065673828125e+02, 8.999997924804687e+02, 8.999737548828125e+02, 8.99992578125e+02, 8.434391479492188e+02, 6.630130737304687e+02, 5.586688110351563e+02, 5.054091796875e+02, 4.781989013671875e+02, 4.643064392089844e+02, 4.572154052734375e+02, 4.5359091796875e+02, 4.517421264648438e+02, 4.507986877441406e+02, 4.50317236328125e+02, 4.500710021972656e+02, 4.499451843261719e+02, 4.498809814453125e+02, 4.498481750488281e+02, 4.498313781738281e+02, 4.498228210449219e+02, 4.498184448242188e+02, 4.498162231445312e+02] diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt index 452d0569e1..a9c2552693 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt @@ -1,7 +1,7 @@ last-generated=2024-07-25 statistics-initialization= { - "nonlinear": "0, 0, 0, 1, 0, 1, 0, 0, 3, 0, 3, 0, 3, 0", + "nonlinear": "0, 0, 0, 1, 0, 1, 0, 0, 4, 0, 4, 0, 4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt index e15e493f31..acb823f27c 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt @@ -2,7 +2,7 @@ last-generated=2024-07-24 statistics-initialization= { "linear": "2, 59, 2", - "nonlinear": "0, 3, 0", + "nonlinear": "0, 4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt index 59bd9fd5e0..66018120c0 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt @@ -1,7 +1,7 @@ last-generated=2024-07-24 statistics-initialization= { - "nonlinear": "3, 0", + "nonlinear": "4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt index 7aa29a5d75..dc6be07223 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt @@ -1,7 +1,7 @@ last-generated=2024-07-24 statistics-initialization= { - "nonlinear": "3, 0", + "nonlinear": "4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt index 50597633bd..7960cd8c96 100644 --- a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt +++ b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt @@ -1,7 +1,7 @@ last-generated=2024-07-24 statistics-initialization= { - "nonlinear": "3, 0", + "nonlinear": "4, 0", "numerical Jacobians": "0" } statistics-simulation= diff --git a/AixLib/Utilities/Examples/TimeUtilities_test.mo b/AixLib/Utilities/Examples/TimeUtilities_test.mo index 77aa585187..3db4bbbea1 100644 --- a/AixLib/Utilities/Examples/TimeUtilities_test.mo +++ b/AixLib/Utilities/Examples/TimeUtilities_test.mo @@ -1,9 +1,8 @@ within AixLib.Utilities.Examples; model TimeUtilities_test "Simulation to test the utilities concerning the time" - import Utilities; extends Modelica.Icons.Example; - Sources.NightMode nightMode(dayStart = 8, dayEnd = 20) annotation(Placement(transformation(extent = {{-12, -32}, {8, -12}}))); - Sources.HourOfDay hourOfDay annotation(Placement(transformation(extent = {{-12, 10}, {8, 30}}))); + AixLib.Utilities.Sources.NightMode nightMode(dayStart = 8, dayEnd = 20) annotation(Placement(transformation(extent = {{-12, -32}, {8, -12}}))); + AixLib.Utilities.Sources.HourOfDay hourOfDay annotation(Placement(transformation(extent = {{-12, 10}, {8, 30}}))); Modelica.Blocks.Interfaces.BooleanOutput boolNightMode annotation(Placement(transformation(extent = {{56, -30}, {76, -10}}))); Modelica.Blocks.Interfaces.RealOutput realSamples[1] annotation(Placement(transformation(extent = {{56, 30}, {76, 50}}))); equation @@ -11,7 +10,6 @@ equation realSamples[1] = hourOfDay.HOD; //Connection for night mode output boolNightMode = nightMode.IsNight.y; - connect(boolNightMode, boolNightMode) annotation(Line(points = {{66, -20}, {66, -20}}, color = {255, 0, 255})); annotation(experiment(StopTime = 604800, Interval = 600), Documentation(revisions = "