Replicate COMPUTE_ANNEXED_DOFS in adjoint namelist for PSyKAl lite code

applications/adjoint_tests/example/configuration.nml

@@ -1,3 +1,7 @@
+&adjoint
+l_compute_annexed_dofs=.false.,
+/
+
 &base_mesh
 file_prefix='mesh_C12_MG',
 geometry='spherical',

applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py

@@ -31,3 +31,18 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Set computation of annexed dofs to false for adjoint_tests
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".false."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/example/configuration.nml

@@ -1,3 +1,6 @@
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12_MG',
 geometry='spherical',

applications/jedi_lfric_tests/example_forecast/configuration.nml

@@ -26,6 +26,9 @@ forecast_length='P0DT6H0M0S',
 
 #### Configure LFRic
 
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12',
 geometry='spherical',

applications/jedi_lfric_tests/example_forecast_pseudo/configuration.nml

@@ -29,6 +29,9 @@ time_step='P0DT1H0M0S',
 
 #### Configure LFRic
 
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12',
 geometry='spherical',

applications/jedi_lfric_tests/example_forecast_pseudo/configuration_op.nml

@@ -29,6 +29,9 @@ time_step='P0DT1H0M0S',
 
 #### Configure LFRic
 
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12',
 geometry='spherical',

applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml

@@ -34,6 +34,10 @@ time_step='P0DT1H0M0S',
 adjoint_test_tolerance=1.0e-4,
 forecast_length='P0DT6H0M0S',
 /
+
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12_MG',
 geometry='spherical',

applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml

@@ -34,6 +34,9 @@ time_step='P0DT1H0M0S',
 adjoint_test_tolerance=1.0e-3,
 forecast_length='P0DT6H0M0S',
 /
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12_MG',
 geometry='spherical',

applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration_op.nml

@@ -38,6 +38,9 @@ forecast_length='P0DT6H0M0S',
 
 #### Configure LFRic
 
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12',
 geometry='spherical',

applications/jedi_lfric_tests/example_tlm_tests/configuration.nml

@@ -34,6 +34,9 @@ time_step='P0DT1H0M0S',
 adjoint_test_tolerance=1.0e-2,
 forecast_length='P0DT6H0M0S',
 /
+&adjoint
+l_compute_annexed_dofs=.true.,
+/
 &base_mesh
 file_prefix='mesh_C12_MG',
 geometry='spherical',

applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py

@@ -31,3 +31,19 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Commands From: rose-meta/lfric-adjoint
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py

@@ -31,3 +31,18 @@ def upgrade(self, config, meta_config=None):
         # Add settings
         return config, self.reports
 """
+
+
+class vn31_t322(MacroUpgrade):
+    """Upgrade macro for ticket #322 by Terence Vockerodt."""
+
+    BEFORE_TAG = "vn3.1"
+    AFTER_TAG = "vn3.1_t322"
+
+    def upgrade(self, config, meta_config=None):
+        # Set computation of annexed dofs to true for adjoint
+        self.add_setting(
+            config, ["namelist:adjoint", "l_compute_annexed_dofs"], ".true."
+        )
+
+        return config, self.reports

rose-stem/app/adjoint_tests/rose-app.conf

@@ -16,7 +16,8 @@ mode=mkdir
 
 [file:configuration.nml]
 mode=auto
-source=(namelist:aerosol)
+source=namelist:adjoint
+      = (namelist:aerosol)
       =  namelist:base_mesh
       = (namelist:blayer)
       =  namelist:boundaries
@@ -99,6 +100,9 @@ source=(namelist:aerosol)
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.false.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_forecast/rose-app.conf

@@ -23,6 +23,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_model
       =  namelist:jedi_pseudo_model
       =  namelist:jedi_lfric_settings
+      =  namelist:adjoint
       =  namelist:base_mesh
       =  namelist:boundaries
       =  namelist:checks
@@ -94,6 +95,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_forecast_pseudo/rose-app.conf

@@ -21,6 +21,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_geometry
       =  namelist:jedi_state
       =  namelist:jedi_pseudo_model
+      =  namelist:adjoint
       =  namelist:base_mesh
       =  namelist:boundaries
       =  namelist:checks
@@ -92,6 +93,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_id_tlm_tests/rose-app.conf

@@ -23,6 +23,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_linear_model
       =  namelist:jedi_pseudo_model
       =  namelist:jedi_lfric_settings
+      =  namelist:adjoint
       = (namelist:aerosol)
       =  namelist:base_mesh
       = (namelist:blayer)
@@ -106,6 +107,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_lfric_tests/rose-app.conf

@@ -23,6 +23,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_linear_model
       =  namelist:jedi_pseudo_model
       =  namelist:jedi_lfric_settings
+      =  namelist:adjoint
       = (namelist:aerosol)
       =  namelist:base_mesh
       = (namelist:blayer)
@@ -106,6 +107,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf

@@ -23,6 +23,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_linear_model
       =  namelist:jedi_pseudo_model
       =  namelist:jedi_lfric_settings
+      =  namelist:adjoint
       = (namelist:aerosol)
       =  namelist:base_mesh
       = (namelist:blayer)
@@ -106,6 +107,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''

rose-stem/app/jedi_tlm_tests/rose-app.conf

@@ -23,6 +23,7 @@ source=namelist:jedi_lfric_tests
       =  namelist:jedi_linear_model
       =  namelist:jedi_pseudo_model
       =  namelist:jedi_lfric_settings
+      =  namelist:adjoint
       = (namelist:aerosol)
       =  namelist:base_mesh
       = (namelist:blayer)
@@ -106,6 +107,9 @@ source=namelist:jedi_lfric_tests
       = (namelist:vertadvect)
       = (namelist:wind_forcing)
 
+[namelist:adjoint]
+l_compute_annexed_dofs=.true.
+
 [!!namelist:aerosol]
 !!aclw_file=''
 !!acsw_file=''