long run without eneryg flux due to water

CliMA · Dec 12, 2024 · 61dbb91 · 61dbb91
1 parent 035b811
commit 61dbb91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 38 deletions.
diff --git a/.buildkite/longruns_gpu/pipeline.yml b/.buildkite/longruns_gpu/pipeline.yml
@@ -41,26 +41,6 @@ steps:
         env:
           CLIMACOMMS_DEVICE: "CUDA"
 
-      - label: ":seedling: Soil-Canopy"
-        command:
-          - julia --color=yes --project=.buildkite experiments/long_runs/land.jl
-        artifact_paths: "land_longrun_gpu/*pdf"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 15:00:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-
-      - label: ":sunglasses: California regional simulation"
-        command:
-          - julia --color=yes --project=.buildkite experiments/long_runs/land_region.jl
-        artifact_paths: "california_longrun_gpu/*pdf"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 00:30:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
-
       - label: "Soil"
         command:
           - julia --color=yes --project=.buildkite experiments/long_runs/soil.jl
@@ -70,13 +50,3 @@ steps:
           slurm_time: 15:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-
-      - label: "Global bucket simulation"
-        command:
-          - julia --color=yes --project=.buildkite experiments/long_runs/bucket.jl
-        artifact_paths: "bucket_longrun_gpu/*pdf"
-        agents:
-          slurm_gpus: 1
-          slurm_time: 00:30:00
-        env:
-          CLIMACOMMS_DEVICE: "CUDA"
diff --git a/experiments/long_runs/soil.jl b/experiments/long_runs/soil.jl
@@ -220,7 +220,7 @@ end
 function setup_and_solve_problem(; greet = false)
 
     t0 = 0.0
-    tf = 60 * 60.0 * 24 * 365
+    tf = 60 * 60.0 * 24 * 365 * 2
     Δt = 450.0
     nelements = (101, 15)
     if greet

diff --git a/src/standalone/Soil/energy_hydrology.jl b/src/standalone/Soil/energy_hydrology.jl
@@ -275,13 +275,13 @@ function ClimaLand.make_compute_imp_tendency(
         # GradC2F returns a Covariant3Vector, so no need to convert.
         @. dY.soil.ρe_int =
             -divf2c_heat(
-                -interpc2f(p.soil.κ) * gradc2f(p.soil.T) -
-                interpc2f(
-                    volumetric_internal_energy_liq(
-                        p.soil.T,
-                        model.parameters.earth_param_set,
-                    ) * p.soil.K,
-                ) * gradc2f(p.soil.ψ + z),
+                -interpc2f(p.soil.κ) * gradc2f(p.soil.T),# -
+                # interpc2f(
+                #    volumetric_internal_energy_liq(
+                #       p.soil.T,
+                #      model.parameters.earth_param_set,
+                # ) * p.soil.K,
+                # ) * gradc2f(p.soil.ψ + z),
             )
 
         # Don't update the prognostic variables we're stepping explicitly