Renamed files

2 files changed, 97 insertions, 0 deletions

diff --git a/Scripts/hw02/hw2.m b/Scripts/hw02/hw2.m
new file mode 100644
index 0000000..6736240
--- /dev/null
+++ b/Scripts/hw02/hw2.m
@@ -0,0 +1,60 @@
+% Homework:2 
+% Author: Christian Kolset
+clear
+
+%% Part 1
+
+% Function parameters
+q0 = 10;
+R = 60;
+L = 9;
+C = 0.00005;
+
+% Use linspace to create an array of 100 points between 0 and 0.8
+t = linspace(0,0.8);
+
+% Calculate the values of q
+q = q0.*2.718.^(-R.*t/(2*L)).*cos(sqrt((1/(L*C))-(R/(2*L))^2).*t);
+
+% Plot q vs t
+hold on
+subplot(2,1,1)
+plot (t,q,'b--*')
+title('Capacity vs Time Graph')
+xlabel('Time')
+ylabel('Charge')
+%legend('Charge','Time')
+hold off
+
+% Make the capacitor 10x bigger
+q2 = q0.*2.718.^(-R.*t/(2.*L)).*cos(sqrt((1/(L.*10.*C))-(R/(2.*L))^2).*t);
+
+% Plot q2 vs t
+hold on
+subplot(2,1,2)
+plot(t,q2,'rs:')
+title('10x Capacity vs Time Graph')
+xlabel('Time')
+ylabel('Charge')
+%legend('Charge','Time')
+hold off
+
+%% Part 2
+%{
+% Given experimental data
+t_exp = 10:10:60;
+c_exp = [3.4 2.6 1.6 1.3 1.0 0.5];
+
+% Expected function
+t_func = 0:0.5:70;
+c_func = 4.84*2.718.^(-0.034*t_func);
+
+% Plot
+hold on
+plot(t_exp,c_exp,'rd:')
+plot(t_func,c_func,'g--')
+xlabel('Time [minutes]')
+ylabel('Concentration [ppm]')
+legend('Experimental','Predicted')
+hold off
+%}
\ No newline at end of file
diff --git a/Scripts/hw03/hw3.m b/Scripts/hw03/hw3.m
new file mode 100644
index 0000000..7caf82c
--- /dev/null
+++ b/Scripts/hw03/hw3.m
@@ -0,0 +1,37 @@
+% HW3
+% Author: Christian Kolset
+% Date: 20.5.21
+
+%% HW3
+% Specify the variables needed to solve this problem (ie. height of each section, diameter, radiaus, ...)
+%   It is alwasy easier to work with variables (diameter_cyl = 25) than to use numbers everywhere, since a 
+%   diameter indicates something specific but the number 25 could mean anything
+diameter_Bot = 25;
+r_bot = diameter_Bot/2;
+h_cone = h-19;
+
+% Specify the height of the water
+h = 20
+% You can comment / uncomment lines below for testing. This will overwrite the previous line for h = 20.
+% For submission, make sure all of the following lines are commented out and h = 20! (OR IT IS MARKED AS WRONG)
+%h = 5
+%h = 19
+%h = 47
+%h = -1
+
+% Now compute the volume. Using conditional statments you will want to first check the height makes sense,
+% and then solve the volume depending on what portion of the tank has been filled.
+% Make sure that your volume is stored in the variable v! (OR IT WILL BE MARKED AS WRONG)
+% You may find it more convenient to move v around in you code, it is only given here to indicate what variable to use.
+%v =
+
+v_cyl = @(h,r_bot) pi*r_bot^2*h;
+v_truncone = @(h_cone,r_bot) 1/3*pi*h_cone*(r_bot^2+r_bot*((h_cone+16.625)/1.33)+((h_cone+16.625)/1.33)^2);
+
+if h > 19
+    v = v_cyl(19,r_bot)+v_truncone(h_cone,r_bot);
+else
+    v = v_cyl(h,r_bot);
+end
+
+fprintf(1,'Volume of Tank: %6.2f\n',v)
\ No newline at end of file