From 8782069a9c3271587083b32ac7db300ddfcf15ea Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 23 Feb 2023 16:15:35 +0100
Subject: [PATCH] added services and fixed ventilation

---
 app-config/openshift/services.yaml              | 17 +++++++++++++++++
 caimira/models.py                               |  4 +++-
 .../models/test_co2_concentration_model.py      |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app-config/openshift/services.yaml b/app-config/openshift/services.yaml
index d6aaf814..2d01387e 100644
--- a/app-config/openshift/services.yaml
+++ b/app-config/openshift/services.yaml
@@ -44,6 +44,23 @@
           deploymentconfig: caimira-app
         sessionAffinity: 'None'
         type: 'ClusterIP'
+    -
+      apiVersion: v1
+      kind: Service
+      metadata:
+        labels:
+          app: caimira-co2-app
+        name: caimira-co2-app
+      spec:
+        ports:
+          - name: 8080-tcp
+            port: 8080
+            protocol: TCP
+            targetPort: 8080
+        selector:
+          deploymentconfig: caimira-co2-app
+        sessionAffinity: 'None'
+        type: 'ClusterIP'
     -
       apiVersion: v1
       kind: Service
diff --git a/caimira/models.py b/caimira/models.py
index 22dc8e6d..87f98776 100644
--- a/caimira/models.py
+++ b/caimira/models.py
@@ -1212,7 +1212,9 @@ class CO2ConcentrationModel(_ConcentrationModelBase):
         return self.CO2_emitters
 
     def removal_rate(self, time: float) -> _VectorisedFloat:
-        return self.ventilation.air_exchange(self.room, time)
+        # 0.25 is a minimal, always present source of ventilation, due
+        # to the air infiltration from the outside.
+        return self.ventilation.air_exchange(self.room, time) + 0.25
 
     def min_background_concentration(self) -> _VectorisedFloat:
         """
diff --git a/caimira/tests/models/test_co2_concentration_model.py b/caimira/tests/models/test_co2_concentration_model.py
index ad4a348c..8c20a994 100644
--- a/caimira/tests/models/test_co2_concentration_model.py
+++ b/caimira/tests/models/test_co2_concentration_model.py
@@ -8,7 +8,7 @@ from caimira import models
 def simple_co2_conc_model():
     return models.CO2ConcentrationModel(
         room=models.Room(200, models.PiecewiseConstant((0., 24.), (293,))),
-        ventilation=models.AirChange(models.PeriodicInterval(period=120, duration=120), 0.25),
+        ventilation=models.AirChange(models.PeriodicInterval(period=120, duration=120), 0.),
         CO2_emitters=models.Population(
             number=5,
             presence=models.SpecificInterval((([0., 4.], ))),