Skip to content

Commit 122a128

Browse files
committed
t_end 400s, debug in coupling loop
1 parent 6146f45 commit 122a128

17 files changed

+67
-65
lines changed

.buildkite/pipeline.yml

+50-50
Original file line numberDiff line numberDiff line change
@@ -463,56 +463,56 @@ steps:
463463

464464
- wait
465465

466-
# - group: "CPU/GPU comparisons"
467-
# steps:
468-
# - label: "Compare Slabplanet: albedo from function"
469-
# key: "compare_slabplanet_albedo_function"
470-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_function --mode_name slabplanet"
471-
# depends_on:
472-
# - "slabplanet_albedo_function"
473-
# - "gpu_slabplanet_albedo_function"
474-
475-
# - label: "Compare Slabplanet: albedo from static map"
476-
# key: "compare_slabplanet_albedo_static_map"
477-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_static_map --mode_name slabplanet"
478-
# depends_on:
479-
# - "slabplanet_albedo_static_map"
480-
# - "gpu_slabplanet_albedo_static_map"
481-
482-
# - label: "Compare Slabplanet: albedo from temporal map"
483-
# key: "compare_slabplanet_albedo_temporal_map"
484-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_temporal_map --mode_name slabplanet"
485-
# depends_on:
486-
# - "slabplanet_albedo_temporal_map"
487-
# - "gpu_slabplanet_albedo_temporal_map"
488-
489-
# - label: "Compare AMIP: albedo from function"
490-
# key: "compare_amip_albedo_function"
491-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_function --mode_name amip"
492-
# depends_on:
493-
# - "amip_albedo_function"
494-
# - "gpu_amip_albedo_function"
495-
496-
# - label: "Compare AMIP: albedo from static map"
497-
# key: "compare_amip_albedo_static_map"
498-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_static_map --mode_name amip"
499-
# depends_on:
500-
# - "amip_albedo_static_map"
501-
# - "gpu_amip_albedo_static_map"
502-
503-
# - label: "Compare AMIP: albedo from temporal map"
504-
# key: "compare_amip_albedo_temporal_map"
505-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_temporal_map --mode_name amip"
506-
# depends_on:
507-
# - "amip_albedo_temporal_map"
508-
# - "gpu_amip_albedo_temporal_map"
509-
510-
# - label: "Compare AMIP target: topography and diagnostic EDMF"
511-
# key: "compare_amip_target_topo_diagedmf_shortrun"
512-
# command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_target_topo_diagedmf_shortrun --mode_name amip"
513-
# depends_on:
514-
# - "amip_target_topo_diagedmf_shortrun"
515-
# - "gpu_amip_target_topo_diagedmf_shortrun"
466+
- group: "CPU/GPU comparisons"
467+
steps:
468+
- label: "Compare Slabplanet: albedo from function"
469+
key: "compare_slabplanet_albedo_function"
470+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_function --mode_name slabplanet"
471+
depends_on:
472+
- "slabplanet_albedo_function"
473+
- "gpu_slabplanet_albedo_function"
474+
475+
- label: "Compare Slabplanet: albedo from static map"
476+
key: "compare_slabplanet_albedo_static_map"
477+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_static_map --mode_name slabplanet"
478+
depends_on:
479+
- "slabplanet_albedo_static_map"
480+
- "gpu_slabplanet_albedo_static_map"
481+
482+
- label: "Compare Slabplanet: albedo from temporal map"
483+
key: "compare_slabplanet_albedo_temporal_map"
484+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name slabplanet_albedo_temporal_map --mode_name slabplanet"
485+
depends_on:
486+
- "slabplanet_albedo_temporal_map"
487+
- "gpu_slabplanet_albedo_temporal_map"
488+
489+
- label: "Compare AMIP: albedo from function"
490+
key: "compare_amip_albedo_function"
491+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_function --mode_name amip"
492+
depends_on:
493+
- "amip_albedo_function"
494+
- "gpu_amip_albedo_function"
495+
496+
- label: "Compare AMIP: albedo from static map"
497+
key: "compare_amip_albedo_static_map"
498+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_static_map --mode_name amip"
499+
depends_on:
500+
- "amip_albedo_static_map"
501+
- "gpu_amip_albedo_static_map"
502+
503+
- label: "Compare AMIP: albedo from temporal map"
504+
key: "compare_amip_albedo_temporal_map"
505+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_albedo_temporal_map --mode_name amip"
506+
depends_on:
507+
- "amip_albedo_temporal_map"
508+
- "gpu_amip_albedo_temporal_map"
509+
510+
- label: "Compare AMIP target: topography and diagnostic EDMF"
511+
key: "compare_amip_target_topo_diagedmf_shortrun"
512+
command: "julia --color=yes --project=experiments/AMIP/ experiments/AMIP/compare_cpu_gpu.jl --cpu_run_name amip_target_topo_diagedmf_shortrun --mode_name amip"
513+
depends_on:
514+
- "amip_target_topo_diagedmf_shortrun"
515+
- "gpu_amip_target_topo_diagedmf_shortrun"
516516

517517
- wait
518518

config/model_configs/amip_albedo_function.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "amip_albedo_function"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/amip_albedo_static_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "amip_albedo_static_map"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/amip_albedo_temporal_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "amip_albedo_temporal_map"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/amip_target_topo_diagedmf_shortrun.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ netcdf_output_at_levels: true
1919
run_name: "amip_target_topo_diagedmf_shortrun"
2020
start_date: "19790301"
2121
surface_setup: "PrescribedSurface"
22-
t_end: "1days"
22+
t_end: "400secs"
2323
topo_smoothing: true
2424
topography: "Earth"
2525
turb_flux_partition: "CombinedStateFluxes"

config/model_configs/gpu_amip_albedo_function.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "gpu_amip_albedo_function"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/gpu_amip_albedo_static_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "gpu_amip_albedo_static_map"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/gpu_amip_albedo_temporal_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ precip_model: "0M"
1616
rad: "gray"
1717
rayleigh_sponge: true
1818
run_name: "gpu_amip_albedo_temporal_map"
19-
t_end: "1days"
19+
t_end: "400secs"
2020
vert_diff: "true"
2121
z_elem: 50
2222
z_stretch: false

config/model_configs/gpu_amip_target_topo_diagedmf_shortrun.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ netcdf_output_at_levels: true
1919
run_name: "gpu_amip_target_topo_diagedmf_shortrun"
2020
start_date: "19790301"
2121
surface_setup: "PrescribedSurface"
22-
t_end: "1days"
22+
t_end: "400secs"
2323
topo_smoothing: true
2424
topography: "Earth"
2525
turb_flux_partition: "CombinedStateFluxes"

config/model_configs/gpu_slabplanet_albedo_function.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ mono_surface: true
1414
precip_model: "0M"
1515
rad: "gray"
1616
run_name: "gpu_slabplanet_albedo_function"
17-
t_end: "1days"
17+
t_end: "400secs"
1818
vert_diff: "true"

config/model_configs/gpu_slabplanet_albedo_static_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ mono_surface: true
1414
precip_model: "0M"
1515
rad: "gray"
1616
run_name: "gpu_slabplanet_albedo_static_map"
17-
t_end: "1days"
17+
t_end: "400secs"
1818
vert_diff: "true"

config/model_configs/gpu_slabplanet_albedo_temporal_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ mono_surface: true
1414
precip_model: "0M"
1515
rad: "gray"
1616
run_name: "gpu_slabplanet_albedo_temporal_map"
17-
t_end: "1days"
17+
t_end: "400secs"
1818
vert_diff: "true"

config/model_configs/slabplanet_albedo_function.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ mono_surface: true
1313
precip_model: "0M"
1414
rad: "gray"
1515
run_name: "slabplanet_albedo_function"
16-
t_end: "1days"
16+
t_end: "400secs"
1717
vert_diff: "true"

config/model_configs/slabplanet_albedo_static_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ mono_surface: true
1313
precip_model: "0M"
1414
rad: "gray"
1515
run_name: "slabplanet_albedo_static_map"
16-
t_end: "1days"
16+
t_end: "400secs"
1717
vert_diff: "true"

config/model_configs/slabplanet_albedo_temporal_map.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ mono_surface: true
1313
precip_model: "0M"
1414
rad: "gray"
1515
run_name: "slabplanet_albedo_temporal_map"
16-
t_end: "1days"
16+
t_end: "400secs"
1717
vert_diff: "true"

experiments/AMIP/compare_cpu_gpu.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function argparse_settings()
2727
end
2828

2929
# Read in CPU and GPU run name info from command line
30-
parsed_args = parse_commandline(argparse_settings())
30+
parsed_args = ArgParse.parse_args(ARGS, argparse_settings())
3131
cpu_run_name = parsed_args["cpu_run_name"]
3232
gpu_run_name = parsed_args["gpu_run_name"]
3333
if isnothing(cpu_run_name) && isnothing(gpu_run_name)

experiments/AMIP/coupler_driver.jl

+2
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ function solve_coupler!(cs)
664664
walltime = @elapsed for t in ((tspan[begin] + Δt_cpl):Δt_cpl:tspan[end])
665665
cs.dates.date[1] = current_date(cs, t) # if not global, `date` is not updated.
666666

667+
debug(cs, debug_dir * "/9_coupler_loop_$t")
668+
667669
## print date on the first of month
668670
if cs.dates.date[1] >= cs.dates.date1[1]
669671
ClimaComms.iamroot(comms_ctx) ? @show(cs.dates.date[1]) : nothing

0 commit comments

Comments
 (0)