added to report, added resources

maths/mission_power_model.m

@@ -109,7 +109,7 @@ figure('Renderer', 'painters', 'Position', [10 10 1000 800])
 
 line_width = 1;
 subplot(3, 1, 1);
-%sgtitle('Mission Power Usage');
+sgtitle('Mission Power Usage');
 % sgtitle(TITLE);
 hold on;
 grid on;
@@ -124,7 +124,7 @@ plot(x, power_out / 1e6, 'r', 'LineWidth', 1);
 
 % yline(P_IN / 1e6, '--m', 'LineWidth', line_width * 0.5);
 
-legend('P In', 'P Out');
+legend('Power In', 'Power Out');
 ylabel('Power (MW)')
 xlim([0 inf])
 ylim([0 ceil(max(max(power_in/1e6), max(power_out/1e6)))])

maths/power_model.m

@@ -27,7 +27,7 @@ P_IN_LOAD       = 0.3;  % most efficient load percent
 %%%%% DP (SS7)
 MAX_P_OUT       = 3842e3;  % W
 MIN_P_OUT       = 362e3;    % W
-TITLE           = 'Dyn. Pos. Sea State 7';
+TITLE           = 'Dynamic Positioning Sea State 7';
 SIMULATION_DAYS = 2;   % days
 
 cable_drum      = get_extra_p(SIMULATION_DAYS*day_to_seconds, 3*hours_to_seconds, 1.5*hours_to_seconds, 946.26e3);
@@ -84,7 +84,7 @@ figure('Renderer', 'painters', 'Position', [10 10 1000 800])
 
 line_width = 1;
 subplot(3, 1, 1);
-%sgtitle(TITLE);
+sgtitle(TITLE);
 hold on;
 grid on;
 
@@ -98,7 +98,7 @@ plot(x, power_out / 1e6, 'r', 'LineWidth', 1);
 
 %yline(p_av / 1e6, '--m', 'LineWidth', line_width * 0.5);
 
-legend('P In', 'P Out', 'Max P Out', 'Min P Out', 'Average P In');
+legend('Power In', 'Power Out', 'Max P Out', 'Min P Out', 'Average P In');
 ylabel('Power (MW)')
 xlim([0 inf])
 % ylim([0 ceil(max(max(power_in/1e6), max(power_out/1e6)))])

maths/power_sim.m

@@ -30,9 +30,12 @@ batt_capacity   = CELL_TOTAL * cell_capacity * cell_voltage / 1e3; % Wh
 
 % P_IN            = MAX_P_IN * P_IN_LOAD; % W, efficient load
 P_IN            = (MIN_P_OUT + MAX_P_OUT) / 2; % W, Average power out
+P_IN_EFF        = 200e3; % W per cell of efficiency
 
 sim_seconds     = SIMULATION_DAYS * 24 * 60 * 60;
 
+twenty_minutes  = 20 * 60; % s
+
 %%%%%%% unit conversions
 batt_capacity   = batt_capacity * 3600; % J
 
@@ -138,24 +141,29 @@ for SECOND=1:sim_seconds
     
     batt_percent = (battery_level(SECOND)/batt_capacity);
     
-    % BATTERY LOW, INCREASE POWER IN
-%     if battery_net < 0 && batt_percent < BATT_WARN_LEVEL
-    if batt_percent < BATT_WARN_LEVEL
-        percent_diff = (BATT_WARN_LEVEL - batt_percent) / BATT_WARN_LEVEL;
-        current_p_in = min(current_p_in + percent_diff * P_IN_INTERVAL, MAX_P_IN);
-    
-    % BATTERY HIGH, DECREASE POWER IN
-    elseif batt_percent > BATT_FULL_LEVEL && batt_percent < 1
-        percent_diff = 1 - (abs(BATT_FULL_LEVEL - batt_percent) / (1 - BATT_FULL_LEVEL));
-        current_p_in = max(current_p_in - percent_diff * P_IN_INTERVAL, MIN_P_IN);
-    
-    % NEITHER, RELAX TO EFFICIENT STATE
-    else
-        delta_to_efficiency = P_IN - current_p_in;
-        if delta_to_efficiency > 0
-            current_p_in = min(current_p_in + P_IN_INTERVAL, P_IN);
+    if mod(SECOND, twenty_minutes) == 0
+        % BATTERY LOW, INCREASE POWER IN
+    %     if battery_net < 0 && batt_percent < BATT_WARN_LEVEL
+        if batt_percent < BATT_WARN_LEVEL
+            % percent_diff = (BATT_WARN_LEVEL - batt_percent) / BATT_WARN_LEVEL;
+            %current_p_in = min(current_p_in + percent_diff * P_IN_INTERVAL, MAX_P_IN);
+            current_p_in = current_p_in + P_IN_EFF;
+
+        % BATTERY HIGH, DECREASE POWER IN
+        elseif batt_percent > BATT_FULL_LEVEL
+            % percent_diff = 1 - (abs(BATT_FULL_LEVEL - batt_percent) / (1 - BATT_FULL_LEVEL));
+            % current_p_in = max(current_p_in - percent_diff * P_IN_INTERVAL, MIN_P_IN);
+
+            current_p_in = max(current_p_in - P_IN_EFF, 0);
+
+        % NEITHER, RELAX TO EFFICIENT STATE
         else
-            current_p_in = max(current_p_in - P_IN_INTERVAL, P_IN);
+            delta_to_efficiency = P_IN - current_p_in;
+            if delta_to_efficiency > 0
+                current_p_in = min(current_p_in + P_IN_INTERVAL, P_IN);
+            else
+                current_p_in = max(current_p_in - P_IN_INTERVAL, P_IN);
+            end
         end
     end
 end