Merge pull request #1276 from CliMA/gb/tubu

Remove CombinedStateFluxes

Author: Sbozzolo

.buildkite/pipeline.yml

@@ -146,20 +146,6 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: "Slabplanet: partitioned turbulent fluxes"
-        key: "slabplanet_partitioned_fluxes"
-        command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_partitioned_fluxes.yml --job_id slabplanet_partitioned_fluxes"
-        artifact_paths: "experiments/ClimaEarth/output/slabplanet_partitioned_fluxes/artifacts/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: "Slabplanet: non-monotonous surface remap"
-        key: "slabplanet_nonmono"
-        command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_nonmono.yml --job_id slabplanet_nonmono"
-        artifact_paths: "experiments/ClimaEarth/output/slabplanet_nonmono/artifacts/*"
-        agents:
-          slurm_mem: 20GB
-
       - label: "Slabplanet: eisenman sea ice"
         key: "slabplanet_eisenman"
         command: "julia --color=yes --project=experiments/ClimaEarth/ experiments/ClimaEarth/run_amip.jl --config_file $CONFIG_PATH/slabplanet_eisenman.yml --job_id slabplanet_eisenman"

NEWS.md

@@ -10,6 +10,21 @@ ClimaCoupler.jl Release Notes
 Instead of zeroing out all NaNs in a surface field, we zero out all values
 where the area fraction is 0, which is logically what we want to do.
 
+#### Removed `CombinedStateFluxes`. PR[#1276](https://github.com/CliMA/ClimaCoupler.jl/pull/1276)
+
+The `CombinedStateFluxes` option for computing fluxes was removed. Now, fluxes
+are always computed with the option formerly known as `PartitionedStateFluxes`
+(no longer an option). Related code was also removed, such as the
+`atmos_turbulent_fluxes_most!` or `combined_turbulent_fluxes!` functions,
+and the `TurbulentFluxPartition` types.
+
+The `partitioned_turbulent_fluxes!` function was renamed to `turbulent_fluxes!`.
+
+As a result of this, the signature of certain functions has changed:
+`update_sim`, `update_model_sims!`, `import_atmos_fields!`, and
+`import_combined_surface_fields!` no longer take the `turbulent_fluxes` argument.
+
+
 #### Remove `area_mask`, `binary_mask`, `mono_surface`. [PR#1268](https://github.com/CliMA/ClimaCoupler.jl/pull/1268/files)
 Removes all uses of `area_mask`, as multiplying quantities by both `area_fraction`
 and `area_mask` will potentially lead to physically inaccurate results.
@@ -31,7 +46,7 @@ is
 Fixed `PartitionedStateFluxes` option. Now `PartitionedStateFluxes` is the
 default: instead of combining the surface states and computing fluxes once, we
 compute surface fluxes for each component and combine them. Results might be
-different. The `CombinedStateFluxes` option will be removed very soon.
+different.
 
 #### Split `setup_and_run` in multiple functions. PR[#1251](https://github.com/CliMA/ClimaCoupler.jl/pull/1251)
 

config/amip_configs/amip.yml

@@ -22,7 +22,6 @@ surface_setup: "PrescribedSurface"
 t_end: "1098days"
 topography: "Earth"
 topo_smoothing: true
-turb_flux_partition: "PartitionedStateFluxes"
 viscous_sponge: true
 z_elem: 63
 z_max: 60000.0

config/benchmark_configs/amip_diagedmf.yml

@@ -14,5 +14,4 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 prescribe_ozone: true
 start_date: "20100101"
 t_end: "12hours"
-turb_flux_partition: "PartitionedStateFluxes"
 use_coupler_diagnostics: false

config/benchmark_configs/amip_diagedmf_io.yml

@@ -14,5 +14,4 @@ prescribed_aerosols: ["CB1", "CB2", "DST01", "OC1", "OC2", "SO4", "SSLT01"]
 prescribe_ozone: true
 start_date: "20100101"
 t_end: "12hours"
-turb_flux_partition: "PartitionedStateFluxes"
 use_coupler_diagnostics: true

config/benchmark_configs/climaatmos.yml

@@ -20,7 +20,6 @@ prescribe_ozone: true
 rad: allskywithclear
 surface_setup: DefaultMoninObukhov
 t_end: 12hours
-turb_flux_partition: "PartitionedStateFluxes"
 vert_diff: "DecayWithHeightDiffusion"
 z_elem: 63
 z_max: 55000.0

config/benchmark_configs/climaatmos_diagedmf.yml

@@ -30,6 +30,5 @@ surface_setup: DefaultMoninObukhov
 t_end: 12hours
 toml: [toml/diagnostic_edmfx.toml]
 turbconv: diagnostic_edmfx
-turb_flux_partition: "PartitionedStateFluxes"
 z_elem: 63
 z_max: 55000.0

config/benchmark_configs/climaatmos_diagedmf_io.yml

@@ -24,7 +24,6 @@ prognostic_tke: true
 rad: allskywithclear
 surface_setup: DefaultMoninObukhov
 t_end: 12hours
-turb_flux_partition: "PartitionedStateFluxes"
 toml: [toml/diagnostic_edmfx.toml]
 turbconv: diagnostic_edmfx
 z_elem: 63

config/ci_configs/amip_target_topo_diagedmf_shortrun.yml

@@ -18,4 +18,3 @@ surface_setup: "PrescribedSurface"
 t_end: "200secs"
 topo_smoothing: true
 topography: "Earth"
-turb_flux_partition: "PartitionedStateFluxes"