From 3be59c79733282dc0fe3c29374c24e861aeb8be1 Mon Sep 17 00:00:00 2001
From: Oliver <oliver-mx@gmx.de>
Date: Wed, 7 Aug 2024 12:32:39 +0200
Subject: [PATCH] New Repository
---
Sim_32_data.m => Sim_0_data.m | 6 +++---
Skript.m | 2 +-
fun_1.m | 16 ++--------------
3 files changed, 6 insertions(+), 18 deletions(-)
rename Sim_32_data.m => Sim_0_data.m (97%)
diff --git a/Sim_32_data.m b/Sim_0_data.m
similarity index 97%
rename from Sim_32_data.m
rename to Sim_0_data.m
index eaa2b7b..01e6d0e 100644
--- a/Sim_32_data.m
+++ b/Sim_0_data.m
@@ -1,11 +1,11 @@
-function [H,Z,swro_Z,ro_water,ro_salt,Mw,Ms,Rw,T0,eta,sigma,p_r,rho_r,C_r,swro_L,swro_alpha,swro_R,swro_KK,swro_x_r,swro_b1,swro_b2,J_r,swro_gamma,swro_gamma2,swro_W_r,L,alpha,R,KK,x_r,b1,b2,Q_r,gamma,gamma2,W_r,cE,pE,rho_E,J_sf_0,J_wf_0,Pd_0,Pd_L,Pf_L,Q_sf_0,pd_0,pf_0,pd_L,pf_L,HP_eff,LP_eff,T_eff,V_m,ERD_eff,ERD_fric,A_ERD,eta_ERD,mix_density,pw,pe,swro_beta_fix,beta_fix,mixer_ERD,version,fig,swro_KF,swro_KD,KF,KD]= Sim_32_data(input1, input2)
+function [H,Z,swro_Z,ro_water,ro_salt,Mw,Ms,Rw,T0,eta,sigma,p_r,rho_r,C_r,swro_L,swro_alpha,swro_R,swro_KK,swro_x_r,swro_b1,swro_b2,J_r,swro_gamma,swro_gamma2,swro_W_r,L,alpha,R,KK,x_r,b1,b2,Q_r,gamma,gamma2,W_r,cE,pE,rho_E,J_sf_0,J_wf_0,Pd_0,Pd_L,Pf_L,Q_sf_0,pd_0,pf_0,pd_L,pf_L,HP_eff,LP_eff,T_eff,V_m,ERD_eff,ERD_fric,A_ERD,eta_ERD,mix_density,pw,pe,swro_beta_fix,beta_fix,mixer_ERD,version,fig,swro_KF,swro_KD,KF,KD]= Sim_0_data(input1, input2)
%% Sim_32_data(input)
%
-% Data for Simulation 3.2
+% Data for Simulation in chapter 3
%
% SWRO-PRO hybrid system I (realistic ERD)
%
-% option_data = 0.32
+% option_data = 0
%
% Input:
% input1 - x
diff --git a/Skript.m b/Skript.m
index 49fd205..dc7d9fe 100644
--- a/Skript.m
+++ b/Skript.m
@@ -8,7 +8,7 @@
% figures for SWRO, PRO and the ERD
% original .m file from: C:>User>bav1839>Documents>MATLAB>Counter-current-solver
close all;
-[Sim_3b_output1, Sim_3b_output2, time]=fun_1(1,.32,'sol',1e6,1e-6), %exportFigures(32);
+[Output1, Output2, time]=fun_1(1,0,'sol',1e6,1e-6),
%figure(1); set(gcf,'color','w'); f = gcf; exportgraphics(f,'Figure_6.png');
%figure(2); set(gcf,'color','w'); f = gcf; exportgraphics(f,'Figure_7.png');
%figure(3); set(gcf,'color','w'); f = gcf; exportgraphics(f,'Figure_8_ERD.png');
diff --git a/fun_1.m b/fun_1.m
index 4a84be8..0967258 100644
--- a/fun_1.m
+++ b/fun_1.m
@@ -28,7 +28,7 @@ function [output1, output2, output3] = fun(input,option_data,obj,option_mesh,opt
%
tic;
%% Read data
-if option_data == 0; DATA = @(x)ERD_test_data(input); end
+if option_data == 0; DATA = @(x)Sim_0_data(input); end
% Simulations
if option_data == 0.11; DATA = @(x)Sim_11_data(input); end
if option_data == 0.12; DATA = @(x)Sim_12_data(input); end
@@ -63,7 +63,7 @@ ode_options = bvpset('Stats','off','NMax', option_mesh, 'RelTol', option_BVP);
try
n=25;
x = linspace(0,1,n);
-
+
%% Create initial guess for the BVP
J_wd_0 = (983/1018)/J_r; % guess for J_wd(0)
J_wf_0 = 0.01353/J_r; % should be close to 0
@@ -483,18 +483,6 @@ plot(x2*L, osm_diff*p_r,'Color', rc,'LineWidth',lw); ylabel('[Pa]','Fontsize',10
-
-
-
-
-
-
-
-
-
-
-
-
end
%% figure 2
if fig(2) == 1
--
GitLab