From 2150b8fd878f683cd1f38e6d4648e2d5b5133678 Mon Sep 17 00:00:00 2001 From: d3dsf Date: Thu, 25 Sep 2025 10:56:26 -0700 Subject: [PATCH 1/7] Fix some of the bugs ... --- .../run_time_dependent_d3d.jl | 48 +++++++------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index eda4a34..2afb477 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -10,57 +10,39 @@ using ArgParse function main() s = ArgParseSettings() @add_arg_table! s begin - """ - shot - """ + "shot" help = "Shot number" arg_type = Int required = true - """ - --EFIT_TREE - """ + "--EFIT_TREE" help = "Source of LCFS shape" arg_type = String default = "EFIT02" - """ - --PROFILES_TREE - """ + "--PROFILES_TREE" help = "Source of profile data" arg_type = String default = "ZIPFIT01" - """ - --CER_ANALYSIS_TYPE - """ + "--CER_ANALYSIS_TYPE" help = "CER analysis type, either CERQUICK, CERAUTO, CERFAST" arg_type = String default = "CERQUICK" - """ - --EFIT_RUN_ID - """ + "--EFIT_RUN_ID" help = "Run ID for EFIT Tree, only last two digits" arg_type = String default = "" - """ - --PROFILES_RUN_ID - """ + "--PROFILES_RUN_ID" help = "Run ID for OMFIT_PROFS Tree, only last three digits" arg_type = String default = "" - """ - --RECONSTRUCTION - """ + "--RECONSTRUCTION" help = "Run time dependent simulation in reconstruction mode" arg_type = Bool default = true - """ - --FIT_PROFILES - """ + "--FIT_PROFILES" help = "Let FUSE fit the raw data into profiles" arg_type = Bool default = true - """ - --USE_LOCAL_CACHE - """ + "--USE_LOCAL_CACHE" help = "Use local data cache" arg_type = Bool default = true @@ -85,9 +67,15 @@ function main() :EFIT_run_id=>args["EFIT_RUN_ID"], :PROFILES_run_id=>args["PROFILES_RUN_ID"]) - @everywhere import FUSE - @everywhere ProgressMeter = FUSE.ProgressMeter - study = FUSE.StudyPostdictive(sty) FUSE.run(study) end + +try + @everywhere import FUSE + @everywhere ProgressMeter = FUSE.ProgressMeter + main() +finally + # Remove PIDs + Distributed.rmprocs(Distributed.workers()) +end From 0a927aabcb0f4b959742d7f3e43b08f51a0294af Mon Sep 17 00:00:00 2001 From: d3dsf Date: Wed, 7 Jan 2026 14:54:31 -0800 Subject: [PATCH 2/7] Turn of output redirect --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index 2afb477..df7189b 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -65,7 +65,8 @@ function main() :PROFILES_tree=>args["PROFILES_TREE"], :CER_analysis_type=>args["CER_ANALYSIS_TYPE"], :EFIT_run_id=>args["EFIT_RUN_ID"], - :PROFILES_run_id=>args["PROFILES_RUN_ID"]) + :PROFILES_run_id=>args["PROFILES_RUN_ID"], + :redirect_output=>false) study = FUSE.StudyPostdictive(sty) FUSE.run(study) From 4ea8761a9e2d47385562c895a6fbeb47d1838d1c Mon Sep 17 00:00:00 2001 From: d3dsf Date: Wed, 7 Jan 2026 20:57:23 -0800 Subject: [PATCH 3/7] Fix the study setup --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index df7189b..4c8171a 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -57,6 +57,7 @@ function main() sty.device = :D3D sty.shots = [args["shot"]] sty.reconstruction = args["RECONSTRUCTION"] + sty.redirect_output = false sty.kw_case_parameters=Dict{Symbol,Any}( :use_local_cache=>args["USE_LOCAL_CACHE"], @@ -65,8 +66,7 @@ function main() :PROFILES_tree=>args["PROFILES_TREE"], :CER_analysis_type=>args["CER_ANALYSIS_TYPE"], :EFIT_run_id=>args["EFIT_RUN_ID"], - :PROFILES_run_id=>args["PROFILES_RUN_ID"], - :redirect_output=>false) + :PROFILES_run_id=>args["PROFILES_RUN_ID"]) study = FUSE.StudyPostdictive(sty) FUSE.run(study) From 9ffb1144e61d89260cdb8a6abbd27364ca55219c Mon Sep 17 00:00:00 2001 From: Nan Shi Date: Tue, 14 Apr 2026 14:42:58 -0700 Subject: [PATCH 4/7] using FINN transport model --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index eda4a34..5cc2a7b 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -67,7 +67,7 @@ function main() end args = parse_args(s) - sty = FUSE.study_parameters(:Postdictive) + sty = FUSE.study_parameters(:PostdictiveRT) sty.server = get(ENV, "FUSE_SERVER", "localhost") sty.n_workers = 0 sty.release_workers_after_run = true @@ -88,6 +88,6 @@ function main() @everywhere import FUSE @everywhere ProgressMeter = FUSE.ProgressMeter - study = FUSE.StudyPostdictive(sty) + study = FUSE.StudyPostdictiveRT(sty) FUSE.run(study) end From 79a45cee0b41422308de28cb9121a18bb3f837bc Mon Sep 17 00:00:00 2001 From: Nan Shi Date: Tue, 14 Apr 2026 15:17:03 -0700 Subject: [PATCH 5/7] for real time run --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index 5cc2a7b..1250473 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -67,7 +67,7 @@ function main() end args = parse_args(s) - sty = FUSE.study_parameters(:PostdictiveRT) + sty = FUSE.study_parameters(:PredictiveRT) sty.server = get(ENV, "FUSE_SERVER", "localhost") sty.n_workers = 0 sty.release_workers_after_run = true @@ -88,6 +88,6 @@ function main() @everywhere import FUSE @everywhere ProgressMeter = FUSE.ProgressMeter - study = FUSE.StudyPostdictiveRT(sty) + study = FUSE.StudyPredictiveRT(sty) FUSE.run(study) end From 9eb1c468d6d69be91519a2964ac5209572e2582e Mon Sep 17 00:00:00 2001 From: d3dsf Date: Tue, 14 Apr 2026 15:27:33 -0700 Subject: [PATCH 6/7] Turn off verbosity --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index 4c8171a..168674f 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -58,6 +58,7 @@ function main() sty.shots = [args["shot"]] sty.reconstruction = args["RECONSTRUCTION"] sty.redirect_output = false + sty.verbose = false sty.kw_case_parameters=Dict{Symbol,Any}( :use_local_cache=>args["USE_LOCAL_CACHE"], From 37a9d3889faa11bd1929d630c08a78b7673eb3b1 Mon Sep 17 00:00:00 2001 From: Nan Shi Date: Thu, 16 Apr 2026 10:23:36 -0700 Subject: [PATCH 7/7] change EFIT and CER server --- scripts/time_dependent_d3d/run_time_dependent_d3d.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl index 1250473..ef0504a 100644 --- a/scripts/time_dependent_d3d/run_time_dependent_d3d.jl +++ b/scripts/time_dependent_d3d/run_time_dependent_d3d.jl @@ -21,7 +21,7 @@ function main() """ help = "Source of LCFS shape" arg_type = String - default = "EFIT02" + default = "EFIT01" """ --PROFILES_TREE """ @@ -33,7 +33,7 @@ function main() """ help = "CER analysis type, either CERQUICK, CERAUTO, CERFAST" arg_type = String - default = "CERQUICK" + default = "CERAUTO" """ --EFIT_RUN_ID """