Remove unused params in oxygen module for iswO2 (#135)

* Remove unused params in oxygen module for iswO2 * Fix iswO2X in parameter in oxygen.F90 * Reorder oxygen_saturation_concentration if statement * revert iswO2 if statment in oxygen.F90 * Update comments in testcase yaml files for iswO2
pmlmodelling · Aug 23, 2024 · a2429e2 · a2429e2
1 parent 9dcbee9
commit a2429e2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/oxygen.F90 b/src/oxygen.F90
@@ -45,7 +45,7 @@ subroutine initialize(self,configunit)
 !EOP
 !-----------------------------------------------------------------------
 !BOC
-      call self%get_parameter(self%iswO2X,'iswO2','','saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)')
+      call self%get_parameter(self%iswO2X,'iswO2','','saturation formulation (1: legacy ERSEM, 2: Weiss 1970)')
       call self%get_parameter(self%iswASFLUX,'iswASFLUX','','air-sea O2 exchange (0: none, 1: Nightingale et al. 2000, 2: Wanninkhof 1992 without chemical enhancement, 3: Wanninkhof 1992 with chemical enhancement, 4: Wanninkhof and McGillis 1999, 5: Wanninkhof 1992 switching to Wanninkhof and McGillis 1999, 6: Wanninkhof 2014)',default=6)
 
       call self%register_state_variable(self%id_O2o,'o','mmol O_2/m^3','oxygen',300._rk)

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
@@ -53,7 +53,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                             # oxygen (mmol O_2/m^3)
   O3:

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
@@ -51,7 +51,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                             # oxygen (mmol O_2/m^3)
   O3:

diff --git a/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml b/testcases/fabm-ersem-15.06-L4-ben-docdyn-iop.yaml
@@ -45,7 +45,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                             # oxygen (mmol O_2/m^3)
   O3:

diff --git a/testcases/fabm-ersem-15.06-L4-noben-docdyn-iop.yaml b/testcases/fabm-ersem-15.06-L4-noben-docdyn-iop.yaml
@@ -45,7 +45,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                            # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                            # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                            # oxygen (mmol O_2/m^3)
   O3:

diff --git a/testcases/fabm-ersem-Blackford2004-L4-ben-stdbac-stdlight.yaml b/testcases/fabm-ersem-Blackford2004-L4-ben-stdbac-stdlight.yaml
@@ -43,7 +43,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                             # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                             # oxygen (mmol O_2/m^3)
   O3:

diff --git a/testcases/fabm-ersem-Blackford2004-L4-noben-stdbac-stdlight.yaml b/testcases/fabm-ersem-Blackford2004-L4-noben-stdbac-stdlight.yaml
@@ -43,7 +43,7 @@ instances:
     long_name: oxygen
     model: ersem/oxygen
     parameters:
-      iswO2: 2                                        # saturation formulation (1: legacy ERSEM, 2: Weiss 1970, 3: Nightingale et al. 2000, 4: Wanninkhof 2014)
+      iswO2: 2                                        # saturation formulation (1: legacy ERSEM, 2: Weiss 1970)
     initialization:
       o: 300.0                                        # oxygen (mmol O_2/m^3)
   O3: