diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
index 83286bd5b..aa70e4569 100644
--- a/.buildkite/longruns/pipeline.yml
+++ b/.buildkite/longruns/pipeline.yml
@@ -44,222 +44,222 @@ steps:
 
   - wait
 
-  # DYAMOND AMIP: 1 day (convection resolving) - running on clima, so need to instantiate again
-  - label: "GPU AMIP SUPERFINE: dyamond_target"
-    key: "gpu_dyamond_target"
-    command:
-      - "echo $$JULIA_DEPOT_PATH"
-
-      - echo "--- Instantiate AMIP env"
-      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'"
-
-      - echo "--- Download artifacts"
-      - "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
-      - "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
-      - "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
-      - "julia --project=artifacts artifacts/download_artifacts.jl"
-
-      - echo "--- Run simulation"
-      - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_dyamond_target.yml"
-    artifact_paths: "experiments/AMIP/output/amip/gpu_dyamond_target_artifacts/*"
-    agents:
-      queue: clima
-      slurm_mem: 20GB
-      slurm_gpus: 1
-      modules: common
-    soft_fail: true
-
-  - group: "Coupler integration and conservation tests"
-
-    steps:
-
-      # Integration tests - the expected results were also confirmed locally
-      - label: "Slabplanet_aqua: nocouple"
-        key: "slabplanet_aqua_atmos_sf_nocouple" # SF at each Atmos stage, no coupling, prescribed SST from atmos
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_nocouple.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_nocouple_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "Slabplanet_aqua: couple"
-        key: "slabplanet_aqua_atmos_sf_couple" # SF at each Atmos stage, coupling, prescribed SST from coupler - identical results to the above confirm 1) initial conditions in Atmos are unchanged compared to the slab, 2) coupling not introducing variability when constant surface
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_couple.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_couple_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "Slabplanet_aqua: coupler fluxes"
-        key: "slabplanet_aqua_coupler_sf" # SF at each coupler timestep, constant ocean - comparing to the above runs, this tests the sensitivity of less frequent flux calculation
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "Slabplanet_aqua: coupler fluxes, evolving ocean"
-        key: "slabplanet_aqua_coupler_sf_evolve_ocn" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving ocean
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_evolve_ocn_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "Slabplanet_terra: coupler fluxes, evolving bucket"
-        key: "slabplanet_terra" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving bucket
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_terra.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_terra/slabplanet_terra_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "Slabplanet: coupler fluxes, evolving ocean and land"
-        key: "slabplanet_coupler_sf_evolve_ocn"
-        command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_coupler_sf_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 1
-          slurm_nodes: 1
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-  - group: "Current target tests: idealized surfaces"
-
-    steps:
-
-      - label: "ClimaAtmos standalone target"
-        command:
-          - srun julia --project=experiments/AMIP/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
-        artifact_paths: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean/*"
-        env:
-          BUILD_HISTORY_HANDLE: ""
-          CLIMACORE_DISTRIBUTED: "MPI"
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, nocouple, atmos flux calc"
-        key: "slabplanet_aqua_target_nocouple"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_nocouple.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_nocouple_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, coupler flux calc"
-        key: "slabplanet_aqua_target"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "TARGET IDEALIZED: new target aqua - evolving slab ocean T"
-        key: "slabplanet_aqua_target_evolve_ocn"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_evolve_ocn_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "TARGET IDEALIZED: new target slab - fixed ocean T, bucket"
-        key: "slabplanet_target"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "TARGET IDEALIZED: new target slab - evolving slab ocean T, bucket"
-        key: "slabplanet_target_evolve_ocn"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target_evolve_ocn.yml"
-        artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_evolve_ocn_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
+  # # DYAMOND AMIP: 1 day (convection resolving) - running on clima, so need to instantiate again
+  # - label: "GPU AMIP SUPERFINE: dyamond_target"
+  #   key: "gpu_dyamond_target"
+  #   command:
+  #     - "echo $$JULIA_DEPOT_PATH"
+
+  #     - echo "--- Instantiate AMIP env"
+  #     - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
+  #     - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'"
+  #     - "julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'"
+
+  #     - echo "--- Download artifacts"
+  #     - "julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'"
+  #     - "julia --project=artifacts -e 'using Pkg; Pkg.precompile()'"
+  #     - "julia --project=artifacts -e 'using Pkg; Pkg.status()'"
+  #     - "julia --project=artifacts artifacts/download_artifacts.jl"
+
+  #     - echo "--- Run simulation"
+  #     - "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_dyamond_target.yml"
+  #   artifact_paths: "experiments/AMIP/output/amip/gpu_dyamond_target_artifacts/*"
+  #   agents:
+  #     queue: clima
+  #     slurm_mem: 20GB
+  #     slurm_gpus: 1
+  #     modules: common
+  #   soft_fail: true
+
+  # - group: "Coupler integration and conservation tests"
+
+  #   steps:
+
+  #     # Integration tests - the expected results were also confirmed locally
+  #     - label: "Slabplanet_aqua: nocouple"
+  #       key: "slabplanet_aqua_atmos_sf_nocouple" # SF at each Atmos stage, no coupling, prescribed SST from atmos
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_nocouple.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_nocouple_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "Slabplanet_aqua: couple"
+  #       key: "slabplanet_aqua_atmos_sf_couple" # SF at each Atmos stage, coupling, prescribed SST from coupler - identical results to the above confirm 1) initial conditions in Atmos are unchanged compared to the slab, 2) coupling not introducing variability when constant surface
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_atmos_sf_couple.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_atmos_sf_couple_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "Slabplanet_aqua: coupler fluxes"
+  #       key: "slabplanet_aqua_coupler_sf" # SF at each coupler timestep, constant ocean - comparing to the above runs, this tests the sensitivity of less frequent flux calculation
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "Slabplanet_aqua: coupler fluxes, evolving ocean"
+  #       key: "slabplanet_aqua_coupler_sf_evolve_ocn" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving ocean
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_coupler_sf_evolve_ocn.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_coupler_sf_evolve_ocn_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "Slabplanet_terra: coupler fluxes, evolving bucket"
+  #       key: "slabplanet_terra" # SF at each coupler timestep, evolving ocean - comparing to the above run, tests the sensitivity of evolving bucket
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_terra.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_terra/slabplanet_terra_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "Slabplanet: coupler fluxes, evolving ocean and land"
+  #       key: "slabplanet_coupler_sf_evolve_ocn"
+  #       command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_coupler_sf_evolve_ocn.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_coupler_sf_evolve_ocn_artifacts/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 1
+  #         slurm_nodes: 1
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  # - group: "Current target tests: idealized surfaces"
+
+  #   steps:
+
+  #     - label: "ClimaAtmos standalone target"
+  #       command:
+  #         - srun julia --project=experiments/AMIP/ test/component_model_tests/climaatmos_standalone/atmos_driver.jl --config_file test/component_model_tests/climaatmos_standalone/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
+  #       artifact_paths: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean/*"
+  #       env:
+  #         BUILD_HISTORY_HANDLE: ""
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, nocouple, atmos flux calc"
+  #       key: "slabplanet_aqua_target_nocouple"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_nocouple.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_nocouple_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "TARGET IDEALIZED: new target aqua - fixed ocean T, coupler flux calc"
+  #       key: "slabplanet_aqua_target"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "TARGET IDEALIZED: new target aqua - evolving slab ocean T"
+  #       key: "slabplanet_aqua_target_evolve_ocn"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_aqua_target_evolve_ocn.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet_aqua/slabplanet_aqua_target_evolve_ocn_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "TARGET IDEALIZED: new target slab - fixed ocean T, bucket"
+  #       key: "slabplanet_target"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "TARGET IDEALIZED: new target slab - evolving slab ocean T, bucket"
+  #       key: "slabplanet_target_evolve_ocn"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/slabplanet_target_evolve_ocn.yml"
+  #       artifact_paths: "experiments/AMIP/output/slabplanet/slabplanet_target_evolve_ocn_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
 
 
   - group: "Current target tests: AMIP surfaces"
 
     steps:
 
-      - label: "MPI AMIP FINE: new target amip"
-        key: "amip_target"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target.yml"
-        artifact_paths: "experiments/AMIP/output/amip/amip_target_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
-
-      - label: "MPI AMIP FINE: new target amip: topo"
-        key: "amip_target_topo"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target_topo.yml"
-        artifact_paths: "experiments/AMIP/output/amip/amip_target_topo_artifacts/*"
-        env:
-          CLIMACORE_DISTRIBUTED: "MPI"
-          BUILD_HISTORY_HANDLE: ""
-        agents:
-          slurm_ntasks_per_node: 16
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16G
-        soft_fail: true
+  #     - label: "MPI AMIP FINE: new target amip"
+  #       key: "amip_target"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target.yml"
+  #       artifact_paths: "experiments/AMIP/output/amip/amip_target_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
+
+  #     - label: "MPI AMIP FINE: new target amip: topo"
+  #       key: "amip_target_topo"
+  #       command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/amip_target_topo.yml"
+  #       artifact_paths: "experiments/AMIP/output/amip/amip_target_topo_artifacts/*"
+  #       env:
+  #         CLIMACORE_DISTRIBUTED: "MPI"
+  #         BUILD_HISTORY_HANDLE: ""
+  #       agents:
+  #         slurm_ntasks_per_node: 16
+  #         slurm_nodes: 4
+  #         slurm_mem_per_cpu: 16G
+  #       soft_fail: true
 
       - label: "MPI AMIP FINE: new target amip: topo + diagedmf"
         key: "amip_target_topo_diagedmf"
@@ -274,27 +274,27 @@ steps:
           slurm_mem_per_cpu: 20G
         soft_fail: true
 
-  - group: "Current target tests on GPU: AMIP surface"
-
-    steps:
-
-      - label: "GPU AMIP FINE: new target amip: topo"
-        key: "gpu_amip_target_topo"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_amip_target_topo.yml"
-        artifact_paths: "experiments/AMIP/output/amip/gpu_amip_target_topo_artifacts/*"
-        agents:
-          slurm_gpus: 1
-          slurm_mem: 16GB
-        soft_fail: true
-
-      - label: "GPU AMIP FINE: new target amip: topo + diagedmf"
-        key: "gpu_amip_target_topo_diagedmf"
-        command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_amip_target_topo_diagedmf.yml"
-        artifact_paths: "experiments/AMIP/output/amip/gpu_amip_target_topo_diagedmf_artifacts/*"
-        agents:
-          slurm_gpus: 1
-          slurm_mem: 16GB
-        soft_fail: true
+  # - group: "Current target tests on GPU: AMIP surface"
+
+  #   steps:
+
+      # - label: "GPU AMIP FINE: new target amip: topo"
+      #   key: "gpu_amip_target_topo"
+      #   command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_amip_target_topo.yml"
+      #   artifact_paths: "experiments/AMIP/output/amip/gpu_amip_target_topo_artifacts/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_mem: 16GB
+      #   soft_fail: true
+
+      # - label: "GPU AMIP FINE: new target amip: topo + diagedmf"
+      #   key: "gpu_amip_target_topo_diagedmf"
+      #   command: "srun julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver.jl --config_file $CONFIG_PATH/gpu_amip_target_topo_diagedmf.yml"
+      #   artifact_paths: "experiments/AMIP/output/amip/gpu_amip_target_topo_diagedmf_artifacts/*"
+      #   agents:
+      #     slurm_gpus: 1
+      #     slurm_mem: 16GB
+      #   soft_fail: true
 
   - wait
 
diff --git a/config/longrun_configs/amip_target_topo_diagedmf.yml b/config/longrun_configs/amip_target_topo_diagedmf.yml
index 78d1e9853..5e2589550 100644
--- a/config/longrun_configs/amip_target_topo_diagedmf.yml
+++ b/config/longrun_configs/amip_target_topo_diagedmf.yml
@@ -13,14 +13,14 @@ energy_check: false
 hourly_checkpoint: true
 idealized_insolation: false
 job_id: "amip_target_topo_diagedmf"
-land_albedo_type: "map_temporal"
+land_albedo_type: "function"
 mode_name: "amip"
 mono_surface: false
 netcdf_output_at_levels: true
 run_name: "amip_target_topo_diagedmf"
-start_date: "19790301"
+start_date: "19790228"
 surface_setup: "PrescribedSurface"
-t_end: "40days"
+t_end: "2days"
 topo_smoothing: true
 topography: "Earth"
 turb_flux_partition: "CombinedStateFluxes"
diff --git a/experiments/AMIP/coupler_driver.jl b/experiments/AMIP/coupler_driver.jl
index 46b72124f..1ecfeac14 100644
--- a/experiments/AMIP/coupler_driver.jl
+++ b/experiments/AMIP/coupler_driver.jl
@@ -114,7 +114,7 @@ config_dict = merge(parsed_args, config_dict)
 config_dict_atmos = get_atmos_config(config_dict)
 
 ## merge dictionaries of command line arguments, coupler dictionary and component model dictionaries
-## (if there are common keys, the last dictorionary in the `merge` arguments takes precedence)
+## (if there are common keys, the last dictionary in the `merge` arguments takes precedence)
 config_dict = merge(config_dict_atmos, config_dict)
 
 ## read in some parsed command line arguments, required by this script
@@ -863,18 +863,18 @@ if ClimaComms.iamroot(comms_ctx)
         ## Compare against observations
         if t_end > 84600
             @info "Error against observations"
+            output_dates = cs.dates.date0[] .+ Second.(atmos_sim.integrator.sol.t)
+
             include("user_io/leaderboard.jl")
             compare_vars = ["pr"]
             function plot_biases(dates, output_name)
                 output_path = joinpath(COUPLER_ARTIFACTS_DIR, "bias_$(output_name).png")
                 Leaderboard.plot_biases(atmos_sim.integrator.p.output_dir, compare_vars, dates; output_path)
             end
-            plot_biases(cs.dates.date, "total")
+            plot_biases(output_dates, "total")
 
             ## collect all days between cs.dates.date0 and cs.dates.date
-            date_array = collect(cs.dates.date0[1]:Dates.Day(1):cs.dates.date[1])
-
-            MAM, JJA, SON, DJF = Leaderboard.split_by_season(date_array)
+            MAM, JJA, SON, DJF = Leaderboard.split_by_season(output_dates)
 
             !isempty(MAM) && plot_biases(MAM, "MAM")
             !isempty(JJA) && plot_biases(JJA, "JJA")