added initialization to all variables (#115)

* added initialization to all variables * Update pyfabm actions * Removing all profiling tests * Updating 0D installation * Updating gotm test * Updating fabm0d test --------- Co-authored-by: Michael Wathen <[email protected]>
pmlmodelling · Nov 10, 2023 · a018ee0 · a018ee0
1 parent 2e88016
commit a018ee0
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 6 deletions.
diff --git a/github-actions/fabm0d-gotm-ersem/aquarium-tut-config-setup.sh b/github-actions/fabm0d-gotm-ersem/aquarium-tut-config-setup.sh
@@ -6,4 +6,4 @@ git clone https://github.com/pmlmodelling/ersem-setups.git
 cd ersem-setups/0d-aquarium
 
 echo "Running FABM with repo configuration"
-~/local/fabm/0d/bin/fabm0d -y ../L4/fabm.yaml
+~/local/fabm/0d/bin/fabm0d -y ../../ersem/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml
diff --git a/github-actions/fabm0d-gotm-ersem/fabm0d-gotm-ersem-dep-debian.sh b/github-actions/fabm0d-gotm-ersem/fabm0d-gotm-ersem-dep-debian.sh
@@ -2,4 +2,4 @@
 
 echo "Installing netCDF"
 sudo apt update
-sudo apt install libnetcdff-dev
+sudo apt install libnetcdff-dev cmake
diff --git a/github-actions/gotm-fabm-ersem/gotm-tut-config-setup.sh b/github-actions/gotm-fabm-ersem/gotm-tut-config-setup.sh
@@ -3,6 +3,7 @@
 echo "Cloning config repo"
 git clone https://github.com/pmlmodelling/ersem-setups.git
 
+cp ersem/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml ersem-setups/L4/fabm.yaml
 cd ersem-setups/L4
 
 echo "Running GOTM with repo configuration"

diff --git a/github-actions/gotm-fabm-ersem/test_profiling.py b/github-actions/gotm-fabm-ersem/test_profiling.py
@@ -126,7 +126,7 @@ def test_ersem_func_names(self):
         name = self.ersem["name"].tolist()
         name_expected = self.ersem_expected["name"].tolist()
         self.assertListEqual(sorted(name_expected), sorted(name))
-        
+
     @pytest.mark.skip()
     def test_gotm_func_names(self):
         """
@@ -154,6 +154,7 @@ def test_netcdf_func_names(self):
         name_expected = self.netcdf_expected["name"].tolist()
         self.assertListEqual(sorted(name_expected), sorted(name))
 
+    @pytest.mark.skip()
     def test_ersem_func_calls(self):
         """
         Check the number of func calls for ERSEM modules stays the same
@@ -169,6 +170,7 @@ def test_ersem_func_calls(self):
                 self.ersem["name"], self.ersem['self calls'])}
         assert calls == calls_expected
 
+    @pytest.mark.skip()
     def test_gotm_func_calls(self):
         """
         Check the number of func calls for GOTM modules stays the same
@@ -182,6 +184,7 @@ def test_gotm_func_calls(self):
             {n: c for n, c in zip(self.gotm["name"], self.gotm['self calls'])}
         assert calls == calls_expected
 
+    @pytest.mark.skip()
     def test_fabm_func_calls(self):
         """
         Check the number of func calls for FABM modules stays the same
@@ -195,6 +198,7 @@ def test_fabm_func_calls(self):
             {n: c for n, c in zip(self.fabm["name"], self.fabm['self calls'])}
         assert calls == calls_expected
 
+    @pytest.mark.skip()
     def test_netcdf_func_calls(self):
         """
         Check the number of func calls for NETCDF modules stays the same

diff --git a/github-actions/pyfabm-ersem/pyfabm-ersem-build.sh b/github-actions/pyfabm-ersem/pyfabm-ersem-build.sh
@@ -10,7 +10,9 @@ git clone https://github.com/fabm-model/fabm.git
 echo "Checking out branch: $BRANCH"
 cd ersem && git checkout $BRANCH && cd ..
 
+echo "Moving ERSEM config files for pyFABM"
+cp github-actions/pyfabm-ersem/setup.cfg fabm
+
 echo "Building PyFABM-ERSEM"
-mkdir build && cd build
-cmake ../fabm/src/drivers/python -DFABM_ERSEM_BASE=../ersem
-make install
+cd fabm
+python -m pip install .
diff --git a/github-actions/pyfabm-ersem/setup.cfg b/github-actions/pyfabm-ersem/setup.cfg
@@ -0,0 +1,4 @@
+[build_ext]
+cmake_opts=-DFABM_ERSEM_BASE=../ersem
+force=1
+debug=1
diff --git a/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop-denit.yaml b/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop-denit.yaml
@@ -67,6 +67,7 @@ instances:
       iswbioalk: 1                                         # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                            # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base
@@ -803,6 +804,7 @@ instances:
       minD: 0.0001                                         # minimum depth of zero-concentration isocline (m)
     initialization:
       o: 0.0225                                            # oxygen (mmol/m^2)
+      o_deep: 0                                            # oxygen below zero isocline (mmol/m^2)
     coupling:
       o_pel: O2/o                                          # pelagic oxygen (mmol/m^3)
   G3:
@@ -863,6 +865,8 @@ instances:
       K4n2: K4/per_layer/n2                                # benthic ammonium in 2nd layer (mmol N/m^2)
       G2o2: G2/per_layer/o2                                # oxygen in 2nd layer (mmol O_2/m^2)
       layer2_thickness: ben_col/layer2_thickness           # thickness of 2nd layer (m)
+    initialization:
+      G4n: 0                                               # dinitrogen gas (mmol N/m^2)
   H1:
     long_name: benthic aerobic bacteria
     model: ersem/benthic_bacteria

diff --git a/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop-n2o.yaml b/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop-n2o.yaml
@@ -65,6 +65,7 @@ instances:
       iswbioalk: 1                                         # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                            # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base
@@ -796,6 +797,7 @@ instances:
       minD: 0.0001                                         # minimum depth of zero-concentration isocline (m)
     initialization:
       o: 0.0225                                            # oxygen (mmol/m^2)
+      o_deep: 0                                            # oxygen below zero isocline (mmol/m^2)
     coupling:
       o_pel: O2/o                                          # pelagic oxygen (mmol/m^3)
   G5:
@@ -868,6 +870,8 @@ instances:
       K4n2: K4/per_layer/n2                                # benthic ammonium in 2nd layer (mmol N/m^2)
       G2o2: G2/per_layer/o2                                # oxygen in 2nd layer (mmol O_2/m^2)
       layer2_thickness: ben_col/layer2_thickness           # thickness of 2nd layer (m)
+    initialization:
+      G4n: 0                                               # dinitrogen gas (mmol N/m^2)
   H1:
     long_name: benthic aerobic bacteria
     model: ersem/benthic_bacteria

diff --git a/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml b/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml
@@ -59,6 +59,7 @@ instances:
       iswbioalk: 1                                         # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                            # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base
@@ -787,6 +788,7 @@ instances:
       minD: 0.0001                                         # minimum depth of zero-concentration isocline (m)
     initialization:
       o: 0.0225                                            # oxygen (mmol/m^2)
+      o_deep: 0                                            # oxygen below zero isocline (mmol/m^2)
     coupling:
       o_pel: O2/o                                          # pelagic oxygen (mmol/m^3)
   G3:
@@ -847,6 +849,8 @@ instances:
       K4n2: K4/per_layer/n2                                # benthic ammonium in 2nd layer (mmol N/m^2)
       G2o2: G2/per_layer/o2                                # oxygen in 2nd layer (mmol O_2/m^2)
       layer2_thickness: ben_col/layer2_thickness           # thickness of 2nd layer (m)
+    initialization:
+      G4n: 0                                               # dinitrogen gas (mmol N/m^2)
   H1:
     long_name: benthic aerobic bacteria
     model: ersem/benthic_bacteria

diff --git a/testcases/fabm-ersem-15.06-L4-noben-docdyn-iop.yaml b/testcases/fabm-ersem-15.06-L4-noben-docdyn-iop.yaml
@@ -59,6 +59,7 @@ instances:
       iswbioalk: 1                                        # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                           # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base

diff --git a/testcases/fabm-ersem-Blackford2004-L4-ben-stdbac-stdlight.yaml b/testcases/fabm-ersem-Blackford2004-L4-ben-stdbac-stdlight.yaml
@@ -57,6 +57,7 @@ instances:
       iswbioalk: 1                                         # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                            # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base
@@ -768,6 +769,7 @@ instances:
       minD: 0.0001                                         # minimum depth of zero-concentration isocline (m)
     initialization:
       o: 0.0225                                            # oxygen (mmol/m^2)
+      o_deep: 0                                            # oxygen below zero isocline (mmol/m^2)
     coupling:
       o_pel: O2/o                                          # pelagic oxygen (mmol/m^3)
   G3:
@@ -828,6 +830,8 @@ instances:
       K4n2: K4/per_layer/n2                                # benthic ammonium in 2nd layer (mmol N/m^2)
       G2o2: G2/per_layer/o2                                # oxygen in 2nd layer (mmol O_2/m^2)
       layer2_thickness: ben_col/layer2_thickness           # thickness of 2nd layer (m)
+    initialization:
+      G4n: 0                                               # dinitrogen gas (mmol N/m^2)
   H1:
     long_name: benthic aerobic bacteria
     model: ersem/benthic_bacteria

diff --git a/testcases/fabm-ersem-Blackford2004-L4-noben-stdbac-stdlight.yaml b/testcases/fabm-ersem-Blackford2004-L4-noben-stdbac-stdlight.yaml
@@ -57,6 +57,7 @@ instances:
       iswbioalk: 1                                    # use bioalkalinity (0: off, 1: on), default = 1
     initialization:
       c: 2130.0                                       # total dissolved inorganic carbon (mmol C/m^3)
+      bioalk: 0                                            # bioalkalinity (mmol/m^3)
   R1:
     long_name: labile dissolved organic matter
     model: ersem/pelagic_base