diff --git a/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py b/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py index 01798ad2b..653d06539 100644 --- a/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py +++ b/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py b/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py index 01798ad2b..653d06539 100644 --- a/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py +++ b/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py b/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py index 01798ad2b..653d06539 100644 --- a/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py +++ b/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/jules/rose-meta/lfric-jules/versions.py b/applications/jules/rose-meta/lfric-jules/versions.py index 01798ad2b..653d06539 100644 --- a/applications/jules/rose-meta/lfric-jules/versions.py +++ b/applications/jules/rose-meta/lfric-jules/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py index 01798ad2b..653d06539 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py b/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py index 01798ad2b..653d06539 100644 --- a/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py +++ b/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py b/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py index 01798ad2b..653d06539 100644 --- a/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py +++ b/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/linear_model/rose-meta/lfric-linear_model/versions.py b/applications/linear_model/rose-meta/lfric-linear_model/versions.py index 01798ad2b..653d06539 100644 --- a/applications/linear_model/rose-meta/lfric-linear_model/versions.py +++ b/applications/linear_model/rose-meta/lfric-linear_model/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/name_transport/rose-meta/lfric-name_transport/versions.py b/applications/name_transport/rose-meta/lfric-name_transport/versions.py index 01798ad2b..653d06539 100644 --- a/applications/name_transport/rose-meta/lfric-name_transport/versions.py +++ b/applications/name_transport/rose-meta/lfric-name_transport/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/ngarch/rose-meta/lfric-ngarch/versions.py b/applications/ngarch/rose-meta/lfric-ngarch/versions.py index 01798ad2b..653d06539 100644 --- a/applications/ngarch/rose-meta/lfric-ngarch/versions.py +++ b/applications/ngarch/rose-meta/lfric-ngarch/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py b/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py index 01798ad2b..653d06539 100644 --- a/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py +++ b/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/applications/transport/rose-meta/lfric-transport/versions.py b/applications/transport/rose-meta/lfric-transport/versions.py index 01798ad2b..653d06539 100644 --- a/applications/transport/rose-meta/lfric-transport/versions.py +++ b/applications/transport/rose-meta/lfric-transport/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/interfaces/coupled_interface/rose-meta/coupling/versions.py b/interfaces/coupled_interface/rose-meta/coupling/versions.py index 01798ad2b..653d06539 100644 --- a/interfaces/coupled_interface/rose-meta/coupling/versions.py +++ b/interfaces/coupled_interface/rose-meta/coupling/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py b/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py index 01798ad2b..653d06539 100644 --- a/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py +++ b/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/rose-stem/app/adjoint_tests/rose-app.conf b/rose-stem/app/adjoint_tests/rose-app.conf index 915553a27..7f9e95c97 100644 --- a/rose-stem/app/adjoint_tests/rose-app.conf +++ b/rose-stem/app/adjoint_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-adjoint_tests/vn3.1 +meta=lfric-adjoint_tests/vn3.1_t378 [command] default=rose env-cat iodef_temp.xml -o iodef.xml; $LAUNCH_SCRIPT/launch-exe @@ -812,8 +812,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/gravity_wave/rose-app.conf b/rose-stem/app/gravity_wave/rose-app.conf index a32534553..b66bfcad3 100644 --- a/rose-stem/app/gravity_wave/rose-app.conf +++ b/rose-stem/app/gravity_wave/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-gravity_wave/vn3.1 +meta=lfric-gravity_wave/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -763,8 +763,11 @@ si_tolerance=1.0e-4 split_w=.false. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag-l300.conf b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag-l300.conf index d950a0730..e3d7b842b 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag-l300.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag-l300.conf @@ -28,6 +28,9 @@ diagnostic_frequency=432 fail_on_non_converged=.false. [namelist:mixing] +conservative_diffusion=.true. +density_weighted=.true. +max_diff_factor=1.0 mix_factor=0.2 smag_l_calc='UseDx' smagorinsky=.true. diff --git a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag.conf b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag.conf index 0ea5ca86b..6af67a4f5 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-robert-moist-smag.conf @@ -28,6 +28,9 @@ diagnostic_frequency=216 fail_on_non_converged=.false. [namelist:mixing] +conservative_diffusion=.true. +density_weighted=.true. +max_diff_factor=1.0 mix_factor=0.2 smag_l_calc='UseDx' smagorinsky=.true. diff --git a/rose-stem/app/gungho_model/rose-app.conf b/rose-stem/app/gungho_model/rose-app.conf index a3915eb35..1cdcbe22b 100644 --- a/rose-stem/app/gungho_model/rose-app.conf +++ b/rose-stem/app/gungho_model/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-gungho_model/vn3.1 +meta=lfric-gungho_model/vn3.1_t378 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ @@ -787,6 +787,7 @@ split_w=.true. !!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_forecast/rose-app.conf b/rose-stem/app/jedi_forecast/rose-app.conf index 064ee951b..b40d049c7 100644 --- a/rose-stem/app/jedi_forecast/rose-app.conf +++ b/rose-stem/app/jedi_forecast/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_forecast/vn3.1 +meta=jedi_forecast/vn3.1_t378 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ @@ -835,8 +835,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_forecast_pseudo/rose-app.conf b/rose-stem/app/jedi_forecast_pseudo/rose-app.conf index 78cef3e9c..0f1ee5c63 100644 --- a/rose-stem/app/jedi_forecast_pseudo/rose-app.conf +++ b/rose-stem/app/jedi_forecast_pseudo/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_forecast_pseudo/vn3.1 +meta=jedi_forecast_pseudo/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -829,8 +829,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf index 42cc71336..5d91adb9a 100644 --- a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf +++ b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_id_tlm_tests/vn3.1 +meta=jedi_id_tlm_tests/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -855,8 +855,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_lfric_tests/rose-app.conf b/rose-stem/app/jedi_lfric_tests/rose-app.conf index a1f6d636e..4544a4d05 100644 --- a/rose-stem/app/jedi_lfric_tests/rose-app.conf +++ b/rose-stem/app/jedi_lfric_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_lfric_tests/vn3.1 +meta=jedi_lfric_tests/vn3.1_t378 [command] default=rose env-cat iodef_temp.xml -o iodef.xml; $LAUNCH_SCRIPT/launch-exe @@ -858,8 +858,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf index af46e888f..2cd482013 100644 --- a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf +++ b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_tlm_forecast_tl/vn3.1 +meta=jedi_tlm_forecast_tl/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -855,8 +855,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jedi_tlm_tests/rose-app.conf b/rose-stem/app/jedi_tlm_tests/rose-app.conf index c3a7be783..899002002 100644 --- a/rose-stem/app/jedi_tlm_tests/rose-app.conf +++ b/rose-stem/app/jedi_tlm_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_tlm_tests/vn3.1 +meta=jedi_tlm_tests/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -855,8 +855,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/jules/rose-app.conf b/rose-stem/app/jules/rose-app.conf index 52e040246..6ada3a677 100644 --- a/rose-stem/app/jules/rose-app.conf +++ b/rose-stem/app/jules/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-jules/vn3.1 +meta=lfric-jules/vn3.1_t378 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -852,8 +852,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/lfric2lfric/rose-app.conf b/rose-stem/app/lfric2lfric/rose-app.conf index 3da09230b..99a2a16f2 100644 --- a/rose-stem/app/lfric2lfric/rose-app.conf +++ b/rose-stem/app/lfric2lfric/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric2lfric/vn3.1 +meta=lfric-lfric2lfric/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -729,8 +729,11 @@ si_tolerance=0 split_w=.false. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='3d_smag' !!mix_factor=0 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/lfric_atm/opt/rose-app-cbl_lem.conf b/rose-stem/app/lfric_atm/opt/rose-app-cbl_lem.conf index 1b2b861d0..2a6fc5a00 100644 --- a/rose-stem/app/lfric_atm/opt/rose-app-cbl_lem.conf +++ b/rose-stem/app/lfric_atm/opt/rose-app-cbl_lem.conf @@ -114,6 +114,9 @@ z0m_specified=0.1 turb_gen_mixph=.false. [namelist:mixing] +conservative_diffusion=.true. +density_weighted=.true. +max_diff_factor=1.0 method='3d_smag' mix_factor=0.2 smag_l_calc='use_geo' diff --git a/rose-stem/app/lfric_atm/opt/rose-app-ral3.conf b/rose-stem/app/lfric_atm/opt/rose-app-ral3.conf index ba59a8370..f6db3cbf8 100644 --- a/rose-stem/app/lfric_atm/opt/rose-app-ral3.conf +++ b/rose-stem/app/lfric_atm/opt/rose-app-ral3.conf @@ -96,8 +96,11 @@ z_surf=50.0 reference_reset_time=$DT [namelist:mixing] +conservative_diffusion=.true. +density_weighted=.true. leonard_kl=2.0 leonard_term=.true. +max_diff_factor=1.0 method='blend_1dbl_fa' mix_factor=0.2 smag_l_calc='UseDx' diff --git a/rose-stem/app/lfric_atm/rose-app.conf b/rose-stem/app/lfric_atm/rose-app.conf index 5cfa112b8..2300e8c1a 100644 --- a/rose-stem/app/lfric_atm/rose-app.conf +++ b/rose-stem/app/lfric_atm/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric_atm/vn3.1 +meta=lfric-lfric_atm/vn3.1_t378 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -810,6 +810,7 @@ split_w=.true. !!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf b/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf index 8edd951c1..b0349f064 100644 --- a/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf +++ b/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric_atm/vn3.1 +meta=lfric-lfric_atm/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -801,8 +801,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/linear_model/rose-app.conf b/rose-stem/app/linear_model/rose-app.conf index fbae2c0a1..0a8c42882 100644 --- a/rose-stem/app/linear_model/rose-app.conf +++ b/rose-stem/app/linear_model/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-linear_model/vn3.1 +meta=lfric-linear_model/vn3.1_t378 [command] default=rose env-cat iodef_temp.xml -o iodef.xml; $LAUNCH_SCRIPT/launch-exe @@ -812,8 +812,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=2.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blend_1dbl_fa' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/name_transport/rose-app.conf b/rose-stem/app/name_transport/rose-app.conf index 1112eb2e7..a6e0d0b09 100644 --- a/rose-stem/app/name_transport/rose-app.conf +++ b/rose-stem/app/name_transport/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-name_transport/vn3.1 +meta=lfric-name_transport/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -771,8 +771,11 @@ split_w=.true. use_operators=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/ngarch/rose-app.conf b/rose-stem/app/ngarch/rose-app.conf index bc6cfdb63..b286cd8b4 100644 --- a/rose-stem/app/ngarch/rose-app.conf +++ b/rose-stem/app/ngarch/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-ngarch/vn3.1 +meta=lfric-ngarch/vn3.1_t378 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -836,8 +836,11 @@ si_tolerance=1.0e-1 split_w=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/shallow_water/rose-app.conf b/rose-stem/app/shallow_water/rose-app.conf index 4180237d9..5189a73d8 100644 --- a/rose-stem/app/shallow_water/rose-app.conf +++ b/rose-stem/app/shallow_water/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-shallow_water/vn3.1 +meta=lfric-shallow_water/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -755,8 +755,11 @@ si_tolerance=1.0e-4 split_w=.false. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/app/transport/rose-app.conf b/rose-stem/app/transport/rose-app.conf index 085ddc4c0..9c449b960 100644 --- a/rose-stem/app/transport/rose-app.conf +++ b/rose-stem/app/transport/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-transport/vn3.1 +meta=lfric-transport/vn3.1_t378 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -770,8 +770,11 @@ split_w=.true. use_operators=.true. [namelist:mixing] +!!conservative_diffusion=.false. +!!density_weighted=.true. !!leonard_kl=1.0 leonard_term=.false. +!!max_diff_factor=1.0 !!method='blending' !!mix_factor=0.2 !!smag_l_calc='UseDx' diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt index fd6edf7b7..1750b2c2c 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_azspice_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 410029831ECEAE7E -Inner product checksum theta = 4204AB0A9B9CB929 -Inner product checksum u = 421842DE12830D66 -Inner product checksum mr1 = 4047C514B4591394 +Inner product checksum rho = 410029806FC3375E +Inner product checksum theta = 4204AB14B35BCB3C +Inner product checksum u = 4218316EF4142EDF +Inner product checksum mr1 = 4047D716E7237520 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt index fd6edf7b7..1750b2c2c 100644 --- a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_robert-moist-smag-BiP100x8-10x10_ex1a_gnu_fast-debug-64bit.txt @@ -1,7 +1,7 @@ -Inner product checksum rho = 410029831ECEAE7E -Inner product checksum theta = 4204AB0A9B9CB929 -Inner product checksum u = 421842DE12830D66 -Inner product checksum mr1 = 4047C514B4591394 +Inner product checksum rho = 410029806FC3375E +Inner product checksum theta = 4204AB14B35BCB3C +Inner product checksum u = 4218316EF4142EDF +Inner product checksum mr1 = 4047D716E7237520 Inner product checksum mr2 = 0 Inner product checksum mr3 = 0 Inner product checksum mr4 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt index 406a369aa..e3dc73842 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483997C9 -Inner product checksum theta = 513548FE -Inner product checksum u = 612F5B38 -Inner product checksum mr1 = 4090F631 -Inner product checksum mr2 = 3591CCEA -Inner product checksum mr3 = 2FA57746 -Inner product checksum mr4 = 33F4FD79 -Inner product checksum mr5 = BE7D083 +Inner product checksum rho = 483997C7 +Inner product checksum theta = 51354900 +Inner product checksum u = 612F5B34 +Inner product checksum mr1 = 4090F60E +Inner product checksum mr2 = 359751BA +Inner product checksum mr3 = 2FA592EE +Inner product checksum mr4 = 33F4FD87 +Inner product checksum mr5 = BE7D082 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt index 5ff558d35..106364b99 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_ens-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483999C8 -Inner product checksum theta = 5135485A -Inner product checksum u = 612F6174 -Inner product checksum mr1 = 40916665 -Inner product checksum mr2 = 364416DC -Inner product checksum mr3 = 2FAC1A90 -Inner product checksum mr4 = 33F4FD6C -Inner product checksum mr5 = BF21909 +Inner product checksum rho = 483999C7 +Inner product checksum theta = 51354858 +Inner product checksum u = 612F6185 +Inner product checksum mr1 = 4091661C +Inner product checksum mr2 = 3661CB0E +Inner product checksum mr3 = 2FAC302C +Inner product checksum mr4 = 33F4FDDA +Inner product checksum mr5 = BF218F8 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt index 2d266dd37..d67d78758 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_ral3_mixmol-seuk_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48398C6E +Inner product checksum rho = 48398C6D Inner product checksum theta = 513542FA -Inner product checksum u = 612EE1CA -Inner product checksum mr1 = 409102F1 -Inner product checksum mr2 = 3592AEA4 -Inner product checksum mr3 = 30010913 +Inner product checksum u = 612EE1D0 +Inner product checksum mr1 = 4091032F +Inner product checksum mr2 = 358D3253 +Inner product checksum mr3 = 30010794 Inner product checksum mr4 = 3404ABD5 -Inner product checksum mr5 = C145771 +Inner product checksum mr5 = C145774 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt index da0cb3435..7ec80cddc 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/azspice/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_azspice_gnu_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 4830B5EB -Inner product checksum theta = 513FD8CE -Inner product checksum u = 5F74A78A -Inner product checksum mr1 = 4155BE3F -Inner product checksum mr2 = 3A3E0C78 -Inner product checksum mr3 = 30A03718 +Inner product checksum rho = 4830B0B9 +Inner product checksum theta = 513FD986 +Inner product checksum u = 5F75CB73 +Inner product checksum mr1 = 41563891 +Inner product checksum mr2 = 3B13C11C +Inner product checksum mr3 = 3223DB3C Inner product checksum mr4 = 0 -Inner product checksum mr5 = 0 +Inner product checksum mr5 = E2E2159 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt index 8bd71eba7..e38b9b3a7 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_comp_tran_ref_3d_l120-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 489A8379 -Inner product checksum theta = 51BA505B -Inner product checksum u = 5F118CC2 -Inner product checksum mr1 = 4187C6A4 -Inner product checksum mr2 = 3AF39B2F -Inner product checksum mr3 = 34D56FED +Inner product checksum rho = 489A8500 +Inner product checksum theta = 51BA4F8F +Inner product checksum u = 5F1189CC +Inner product checksum mr1 = 41880E64 +Inner product checksum mr2 = 3AFB828E +Inner product checksum mr3 = 34CC725C Inner product checksum mr4 = 0 Inner product checksum mr5 = 0 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 317acc6a4..16dcea131 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 483997DE -Inner product checksum theta = 51354909 -Inner product checksum u = 612F5E11 -Inner product checksum mr1 = 4090F5E4 -Inner product checksum mr2 = 358EB0BA -Inner product checksum mr3 = 2FA519F0 -Inner product checksum mr4 = 33F4FD57 -Inner product checksum mr5 = BE85FEC +Inner product checksum rho = 483997DD +Inner product checksum theta = 51354908 +Inner product checksum u = 612F5E0C +Inner product checksum mr1 = 4090F5C3 +Inner product checksum mr2 = 35A68EEB +Inner product checksum mr3 = 2FA52A67 +Inner product checksum mr4 = 33F4FD5E +Inner product checksum mr5 = BE83A51 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 7b6d5479c..b99968908 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_ens-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ Inner product checksum rho = 483997E3 Inner product checksum theta = 51354900 -Inner product checksum u = 612F5EB6 -Inner product checksum mr1 = 40910DBB -Inner product checksum mr2 = 3600A9CC -Inner product checksum mr3 = 2FA77A9F -Inner product checksum mr4 = 33F4FFEC -Inner product checksum mr5 = BE04B21 +Inner product checksum u = 612F5EC6 +Inner product checksum mr1 = 40910E42 +Inner product checksum mr2 = 35E5F23F +Inner product checksum mr3 = 2FA72A5B +Inner product checksum mr4 = 33F4FFD7 +Inner product checksum mr5 = BE04BF6 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt index 24e480b50..0947a3505 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_ral3_mixmol-seuk_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 48398C6A +Inner product checksum rho = 48398C69 Inner product checksum theta = 51354302 -Inner product checksum u = 612EDCAC -Inner product checksum mr1 = 40910338 -Inner product checksum mr2 = 35876274 -Inner product checksum mr3 = 30010BB7 -Inner product checksum mr4 = 3404AC2D -Inner product checksum mr5 = C14A22D +Inner product checksum u = 612EDCCC +Inner product checksum mr1 = 409102F2 +Inner product checksum mr2 = 35965C05 +Inner product checksum mr3 = 3001046E +Inner product checksum mr4 = 3404AC29 +Inner product checksum mr5 = C14A228 Inner product checksum mr6 = 0 diff --git a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt index d6c9e6e85..152a90ecd 100644 --- a/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt +++ b/rose-stem/site/meto/kgos/lfric_atm/ex1a/checksum_lfric_atm_rce-BiP64x64-1500x1500_MG_ex1a_cce_fast-debug-32bit.txt @@ -1,9 +1,9 @@ -Inner product checksum rho = 4830B653 -Inner product checksum theta = 513FD830 -Inner product checksum u = 5F74B058 -Inner product checksum mr1 = 4155BC4A -Inner product checksum mr2 = 3A3F75A2 -Inner product checksum mr3 = 3088CA46 +Inner product checksum rho = 4830B10A +Inner product checksum theta = 513FD94C +Inner product checksum u = 5F75C536 +Inner product checksum mr1 = 4156189C +Inner product checksum mr2 = 3B15FCA8 +Inner product checksum mr3 = 32669B99 Inner product checksum mr4 = 0 -Inner product checksum mr5 = 0 +Inner product checksum mr5 = 12B0A1C4 Inner product checksum mr6 = 0 diff --git a/science/adjoint/rose-meta/lfric-adjoint/versions.py b/science/adjoint/rose-meta/lfric-adjoint/versions.py index 01798ad2b..653d06539 100644 --- a/science/adjoint/rose-meta/lfric-adjoint/versions.py +++ b/science/adjoint/rose-meta/lfric-adjoint/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports diff --git a/science/gungho/rose-meta/lfric-gungho/versions.py b/science/gungho/rose-meta/lfric-gungho/versions.py index 6f8337d1c..1b874b392 100644 --- a/science/gungho/rose-meta/lfric-gungho/versions.py +++ b/science/gungho/rose-meta/lfric-gungho/versions.py @@ -20,18 +20,16 @@ def __repr__(self): """ Copy this template and complete to add your macro - class vnXX_txxx(MacroUpgrade): # Upgrade macro for by - BEFORE_TAG = "vnX.X" AFTER_TAG = "vnX.X_txxx" - def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + class vn31_t378(MacroUpgrade): """Upgrade macro for ticket #378 by Thomas Bendall.""" @@ -39,13 +37,13 @@ class vn31_t378(MacroUpgrade): AFTER_TAG = "vn3.1_t378" def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho self.add_setting( config, ["namelist:mixing", "conservative_diffusion"], ".false." ) self.add_setting( config, ["namelist:mixing", "density_weighted"], ".true." ) - self.add_setting( - config, ["namelist:mixing", "max_diff_factor"], "1.0" - ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + return config, self.reports diff --git a/science/linear/rose-meta/lfric-linear/versions.py b/science/linear/rose-meta/lfric-linear/versions.py index 01798ad2b..653d06539 100644 --- a/science/linear/rose-meta/lfric-linear/versions.py +++ b/science/linear/rose-meta/lfric-linear/versions.py @@ -31,3 +31,22 @@ def upgrade(self, config, meta_config=None): # Add settings return config, self.reports """ + + +class vn31_t378(MacroUpgrade): + """Upgrade macro for ticket #378 by Thomas Bendall.""" + + BEFORE_TAG = "vn3.1" + AFTER_TAG = "vn3.1_t378" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + self.add_setting( + config, ["namelist:mixing", "conservative_diffusion"], ".false." + ) + self.add_setting( + config, ["namelist:mixing", "density_weighted"], ".true." + ) + self.add_setting(config, ["namelist:mixing", "max_diff_factor"], "1.0") + + return config, self.reports