fix error

core functions/气水两相流部分代码/mainRS_MB_gas_water_flow.m

@@ -130,6 +130,7 @@ while t < tend
         if dt >= dtmax(k)
             dt = dtmax(k);
         end
+        emit_progress(w, sprintf('Progress: %.4f / %.4f day', t, sum(time)), count, t, dt);
         if i ~= Nmax
             % waitbar(t / tend);
             % disp(t);
@@ -147,7 +148,21 @@ trun.leqs_solve_time=leqs_solve_time;
 trun.total_simulation_time = etime(clock,t_start);
 trun.Newton_step=Newton_step;
 trun.Newtons_vs_time=Newtons_vs_time;
+emit_progress(w, 'Calculation completed', count, t, dt);
 fprintf('计算完成');
 % close(h0);
+end
 
+function emit_progress(w, message, step, time_value, dt_value)
+if ~isfield(w, 'progress_callback') || isempty(w.progress_callback)
+    return;
+end
 
+meta = struct( ...
+    'step', step, ...
+    'time', time_value, ...
+    'dt', dt_value, ...
+    'status', 'Running...');
+
+feval(w.progress_callback, message, meta);
+end

core functions/油水两相流部分代码/mainRS_MB_oil_water_flow.m

@@ -130,6 +130,7 @@ while t < tend
         if dt >= dtmax(k)
             dt = dtmax(k);
         end
+        emit_progress(w, sprintf('Progress: %.4f / %.4f day', t, sum(time)), count, t, dt);
         if i ~= Nmax
             % waitbar(t / tend);
             % disp(t);
@@ -147,7 +148,21 @@ trun.leqs_solve_time=leqs_solve_time;
 trun.total_simulation_time = etime(clock,t_start);
 trun.Newton_step=Newton_step;
 trun.Newtons_vs_time=Newtons_vs_time;
+emit_progress(w, 'Calculation completed', count, t, dt);
 fprintf('计算完成');
 % close(h0);
+end
 
+function emit_progress(w, message, step, time_value, dt_value)
+if ~isfield(w, 'progress_callback') || isempty(w.progress_callback)
+    return;
+end
 
+meta = struct( ...
+    'step', step, ...
+    'time', time_value, ...
+    'dt', dt_value, ...
+    'status', 'Running...');
+
+feval(w.progress_callback, message, meta);
+end

core functions/程序整合及组分流部分代码/mainRS_MB_2026.m

@@ -142,6 +142,7 @@ for k = 1:size(well_schedules,1)
             if dt >= dtmax(k)
                 dt = dtmax(k);
             end
+            emit_progress(w, sprintf('Progress: %.4f / %.4f day', t, sum(time)), count, t, dt);
             if i ~= Nmax
                 % waitbar(t / tend);
                 % disp(t);
@@ -159,7 +160,21 @@ trun.leqs_solve_time=leqs_solve_time;
 trun.total_simulation_time = etime(clock,t_start);
 trun.Newton_step=Newton_step;
 trun.Newtons_vs_time=Newtons_vs_time;
+emit_progress(w, 'Calculation completed', count, t, dt);
 fprintf('计算完成');
 % close(h0);
+end
 
+function emit_progress(w, message, step, time_value, dt_value)
+if ~isfield(w, 'progress_callback') || isempty(w.progress_callback)
+    return;
+end
 
+meta = struct( ...
+    'step', step, ...
+    'time', time_value, ...
+    'dt', dt_value, ...
+    'status', 'Running...');
+
+feval(w.progress_callback, message, meta);
+end

core functions/程序整合及组分流部分代码/solver_NR.m

@@ -1,4 +1,8 @@
-function [Times, OutputRs, Wellpara, trun] = solver_NR(r, flow_model, f, os, state0, yitap,yitas,omega,Nmax,epsave,epsmax,dtmin,dtmax,Wellc,time,well_schedules)
+function [Times, OutputRs, Wellpara, trun] = solver_NR(r, flow_model, f, os, state0, yitap,yitas,omega,Nmax,epsave,epsmax,dtmin,dtmax,Wellc,time,well_schedules, progress_callback)
+if nargin < 17
+    progress_callback = [];
+end
+
 w.yitap = yitap;
 w.yitas = yitas;
 w.omega = omega;
@@ -12,6 +16,7 @@ w.dtmax = dtmax;
 w.Wellc = Wellc; 
 w.time = time;
 w.well_schedules = well_schedules;
+w.progress_callback = progress_callback;
 %% 计算
 if r.modelflag==1 || r.modelflag==4 || r.modelflag==5
     if flow_model == 1
@@ -25,4 +30,4 @@ if r.modelflag==1 || r.modelflag==4 || r.modelflag==5
     end
     % [Times, OutputRs, Wellpara, trun] = mainRS_MB_2014(r, f, os, w, state0);   
 end
-end
+end

gui_support/app/EDFMAppController.m

@@ -88,21 +88,20 @@ classdef EDFMAppController < handle
             drawnow;
 
             try
-                logText = evalc('[r, Times, OutputRs, Wellpara, trun] = run_case(obj.Config);');
+                progress_callback = @(message, meta) obj.onRunProgress(message, meta);
+                [r, Times, OutputRs, Wellpara, trun] = run_case(obj.Config, progress_callback);
                 obj.Results = struct( ...
                     'r', r, ...
                     'Times', Times, ...
                     'OutputRs', {OutputRs}, ...
                     'Wellpara', {Wellpara}, ...
                     'trun', trun, ...
-                    'captured_log', logText);
+                    'captured_log', '');
-                if ~isempty(strtrim(logText))
-                    obj.appendLog(logText);
-                end
                 obj.refreshResults();
                 if strlength(obj.CurrentPlotAction) ~= 0
                     obj.refreshCasePlotControls(obj.CurrentPlotAction);
                 end
+                obj.appendLog('Run completed.');
                 obj.setRunProgress('Completed');
                 obj.setStatus('Run completed');
             catch ME
@@ -690,6 +689,35 @@ classdef EDFMAppController < handle
             drawnow limitrate;
         end
 
+        function onRunProgress(obj, message, meta)
+            if nargin < 3 || ~isstruct(meta)
+                meta = struct();
+            end
+
+            if nargin >= 2 && strlength(strtrim(string(message))) ~= 0
+                obj.appendLog(message);
+            end
+
+            if isfield(meta, 'status') && ~isempty(meta.status)
+                obj.setRunProgress(meta.status);
+            end
+
+            if isfield(meta, 'step') || isfield(meta, 'time') || isfield(meta, 'dt')
+                stageText = obj.getMetaText(meta, 'step', '-');
+                timeText = obj.getMetaText(meta, 'time', '-');
+                dtText = obj.getMetaText(meta, 'dt', '-');
+                obj.setRunHeader(stageText, timeText, dtText);
+            end
+        end
+
+        function textValue = getMetaText(obj, meta, fieldName, fallback)
+            if isfield(meta, fieldName) && ~isempty(meta.(fieldName))
+                textValue = obj.valueToShortText(meta.(fieldName));
+            else
+                textValue = fallback;
+            end
+        end
+
         function setRunProgress(obj, textValue)
             if isprop(obj.App, 'RunProgressLabel')
                 obj.App.RunProgressLabel.Text = ['RunProgress: ', char(string(textValue))];

gui_support/results/render_case_plot_in_axes.m

@@ -10,7 +10,7 @@ arguments
 end
 
 action_id = lower(string(action_id));
-cla(ax);
+reset_plot_axes(ax);
 
 switch action_id
     case "plot_well_response"
@@ -35,6 +35,7 @@ wellpara = results.Wellpara;
 well_index = get_option(options, 'well_index', 1);
 metric = upper(string(get_option(options, 'metric', "BHP")));
 
+view(ax, 2);
 set(ax, 'XScale', 'linear', 'YScale', 'linear');
 
 if isempty(wellpara)
@@ -122,6 +123,7 @@ for i = 1:nx * ny
 end
 
 fill(ax, x, y, dis, 'EdgeColor', 'interp');
+view(ax, 2);
 axis(ax, 'equal');
 axis(ax, 'tight');
 colormap(ax, jet);
@@ -201,6 +203,7 @@ for i = 1:nx * ny
 end
 
 fill(ax, x, y, dis, 'EdgeColor', 'interp');
+view(ax, 2);
 axis(ax, 'equal');
 axis(ax, 'tight');
 colormap(ax, jet);
@@ -259,3 +262,26 @@ else
     value = fallback;
 end
 end
+
+function reset_plot_axes(ax)
+cla(ax);
+hold(ax, 'off');
+grid(ax, 'off');
+view(ax, 2);
+colorbar(ax, 'off');
+
+set(ax, ...
+    'XScale', 'linear', ...
+    'YScale', 'linear', ...
+    'ZScale', 'linear', ...
+    'XLimMode', 'auto', ...
+    'YLimMode', 'auto', ...
+    'ZLimMode', 'auto', ...
+    'CLimMode', 'auto', ...
+    'DataAspectRatioMode', 'auto', ...
+    'PlotBoxAspectRatioMode', 'auto', ...
+    'CameraPositionMode', 'auto', ...
+    'CameraTargetMode', 'auto', ...
+    'CameraUpVectorMode', 'auto', ...
+    'CameraViewAngleMode', 'auto');
+end

gui_support/runtime/run_case.m

@@ -1,4 +1,4 @@
-function [r, Times, OutputRs, Wellpara, trun] = run_case(config)
+function [r, Times, OutputRs, Wellpara, trun] = run_case(config, progress_callback)
 %RUN_CASE Execute a simulation from unified config.
 %
 % This is the first migration step from hard-coded main1.m scripts toward a
@@ -8,6 +8,7 @@ function [r, Times, OutputRs, Wellpara, trun] = run_case(config)
 
 arguments
     config (1,1) struct
+    progress_callback = []
 end
 
 project_root = fileparts(fileparts(fileparts(mfilename('fullpath'))));
@@ -81,7 +82,8 @@ Wellc = handle_well1_well2(well1, well2, welloc, r);
     config.schedule.dtmax, ...
     Wellc, ...
     config.schedule.time, ...
-    config.schedule.well_schedules);
+    config.schedule.well_schedules, ...
+    progress_callback);
 
 trun.run_time = toc(overall_tic);
 end