diff --git a/ship_model_lib/01_AddedResistance.ipynb b/ship_model_lib/01_AddedResistance.ipynb index 0e04eee..6a1f0e6 100644 --- a/ship_model_lib/01_AddedResistance.ipynb +++ b/ship_model_lib/01_AddedResistance.ipynb @@ -1681,9 +1681,9 @@ 0.004835842409560085, 0.0030977699312192217, 0.0017437348618278197, - 7.753868845447831E-4, - 1.9390578221788058E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221788058, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -1863,9 +1863,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845448028E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845448028, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -2456,9 +2456,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -2638,9 +2638,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845448028E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845448028, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -3053,9 +3053,9 @@ { "name": "Encounter angle: 90.0", "r": [ - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -3231,9 +3231,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -3413,7 +3413,7 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33 + 2.3869418286106128e-33 ], "theta": [ 0.0, @@ -3828,9 +3828,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -4006,9 +4006,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -4603,9 +4603,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -4781,9 +4781,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278346, - 7.753868845447634E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447634, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -6550,9 +6550,9 @@ 0.004835842409560085, 0.0030977699312192217, 0.0017437348618278197, - 7.753868845447831E-4, - 1.9390578221788058E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221788058, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -6732,9 +6732,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845448028E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845448028, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -7325,9 +7325,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -7507,9 +7507,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845448028E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845448028, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -7922,9 +7922,9 @@ 360.0 ], "y": [ - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -8100,9 +8100,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -8282,7 +8282,7 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33 + 2.3869418286106128e-33 ] }, { @@ -8697,9 +8697,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -8875,9 +8875,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278047, - 7.753868845447831E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447831, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, @@ -9472,9 +9472,9 @@ 0.0, 0.0, 0.0, - 2.3869418286106128E-33, - 1.9390578221787564E-4, - 7.753868845447634E-4, + 2.3869418286106128e-33, + 0.00019390578221787564, + 0.0007753868845447634, 0.0017437348618278346, 0.0030977699312192417, 0.004835842409560085, @@ -9650,9 +9650,9 @@ 0.004835842409560085, 0.0030977699312192417, 0.0017437348618278346, - 7.753868845447634E-4, - 1.9390578221787564E-4, - 2.3869418286106128E-33, + 0.0007753868845447634, + 0.00019390578221787564, + 2.3869418286106128e-33, 0.0, 0.0, 0.0, diff --git a/ship_model_lib/02_Propulsor.ipynb b/ship_model_lib/02_Propulsor.ipynb index a257d3b..22fef70 100644 --- a/ship_model_lib/02_Propulsor.ipynb +++ b/ship_model_lib/02_Propulsor.ipynb @@ -1172,13 +1172,11 @@ { "cell_type": "code", "execution_count": null, + "metadata": {}, "outputs": [], "source": [ "# test for get_propulsor_data_from_vessel_speed_thrust" - ], - "metadata": { - "collapsed": false - } + ] } ], "metadata": { diff --git a/ship_model_lib/07_operation_profile_structure.ipynb b/ship_model_lib/07_operation_profile_structure.ipynb index 938e3c8..eb02ec7 100644 --- a/ship_model_lib/07_operation_profile_structure.ipynb +++ b/ship_model_lib/07_operation_profile_structure.ipynb @@ -11,44 +11,31 @@ }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:46.748209Z", - "start_time": "2024-04-12T12:58:46.671222Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#| default_exp operation_profile_structure\n", "%load_ext autoreload\n", "%autoreload 2" - ], - "outputs": [], - "execution_count": 1 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:47.322207Z", - "start_time": "2024-04-12T12:58:46.750204Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#| hide\n", "from nbdev.showdoc import *\n", "from typing import Union" - ], - "outputs": [], - "execution_count": 2 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:47.511209Z", - "start_time": "2024-04-12T12:58:47.323207Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#| export\n", "import numpy as np\n", @@ -245,35 +232,25 @@ " 'weather': self.weather.to_dict_scalar() if self.weather is not None else None,\n", " 'location': self.location.to_dict_scalar() if self.location is not None else None,\n", " }" - ], - "outputs": [], - "execution_count": 3 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:47.848204Z", - "start_time": "2024-04-12T12:58:47.513204Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "#| hide\n", "import nbdev;\n", "\n", "nbdev.nbdev_export()" - ], - "outputs": [], - "execution_count": 4 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:47.925204Z", - "start_time": "2024-04-12T12:58:47.849204Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "from random import random\n", "\n", @@ -294,18 +271,13 @@ ")\n", "for key, value in data.items():\n", " assert getattr(weather, key) == value" - ], - "outputs": [], - "execution_count": 5 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:48.002205Z", - "start_time": "2024-04-12T12:58:47.926204Z" - } - }, + "execution_count": null, + "metadata": {}, + "outputs": [], "source": [ "operation_point = OperationPoint(\n", " timestamp_seconds=123,\n", @@ -318,22 +290,12 @@ " longitude=5.6,\n", " latitude=4.2\n", " ))" - ], - "outputs": [], - "execution_count": 6 + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:48.079205Z", - "start_time": "2024-04-12T12:58:48.003206Z" - } - }, - "source": [ - "print(operation_point.weather.to_dict())\n", - "print(operation_point.location.to_dict())" - ], + "execution_count": null, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -344,19 +306,15 @@ ] } ], - "execution_count": 7 + "source": [ + "print(operation_point.weather.to_dict())\n", + "print(operation_point.location.to_dict())" + ] }, { "cell_type": "code", - "metadata": { - "ExecuteTime": { - "end_time": "2024-04-12T12:58:48.156207Z", - "start_time": "2024-04-12T12:58:48.080205Z" - } - }, - "source": [ - "operation_point.to_dict_scalar()" - ], + "execution_count": null, + "metadata": {}, "outputs": [ { "data": { @@ -378,19 +336,21 @@ " 'location': {'longitude': 5.6, 'latitude': 4.2}}" ] }, - "execution_count": 8, + "execution_count": null, "metadata": {}, "output_type": "execute_result" } ], - "execution_count": 8 + "source": [ + "operation_point.to_dict_scalar()" + ] }, { "cell_type": "code", + "execution_count": null, "metadata": {}, - "source": [], "outputs": [], - "execution_count": null + "source": [] } ], "metadata": {