toolbars

add-my-pet · Feb 20, 2025 · cb8482f · cb8482f
1 parent a462154
commit cb8482f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/animal/get_tj.m b/animal/get_tj.m
@@ -83,7 +83,7 @@
   if exist('info_tb','var') && exist('info_lj','var'); info = min(info_tb, info_lj); end
 
   % juvenile & adult
-  options = odeset('Events',@event_jp, 'AbsTol',1e-10, 'RelTol',1e-10); 
+  options = odeset('Events',@event_jp, 'AbsTol',1e-8, 'RelTol',1e-8); 
   %options = odeset('Events',@event_jp); 
   [t, vel, tau_jp, vel_jp] = ode45(@dget_lj, [-1e-10; tau], vel_b, options, info_tau, f, l_b, g, k, l_T, v_Hj, v_Hp);
   tvel = [t, vel]; tvel(1,:) = []; if (length(tau)==1); tvel = tvel(end,:); end

diff --git a/animal/get_tx.m b/animal/get_tx.m
@@ -81,7 +81,7 @@
 %   end
   f_0b = 1; % embryo development is independent of nutritional state of the mother
   %
-  options = odeset('Events',@event_b, 'AbsTol',1e-9, 'RelTol',1e-9);   
+  options = odeset('Events',@event_b, 'AbsTol',1e-8, 'RelTol',1e-8);   
   % optional input tel_b
   if ~exist('tel_b','var') || isempty(tel_b)
     [~, ~, tau_b, vl_b] = ode45(@dget_lb, [0; 1e10], [1e-20; 1e-20], options, f_0b, s_F, g, k, v_Hb);
@@ -108,7 +108,7 @@
   end
   tvel = [tau, vel]; tvel(1,:) = []; info = 1;
 
-  if ~isreal(tau_b) || ~isreal(tau_x) || ~isreal(tau_p) || tau_b < 0 || tau_x < 0 || tau_p < 0 % tb, tx and tp must be real and positive
+  if any(~isreal([tau_b, tau_x, tau_p])) | any([tau_b, tau_x, tau_p] < 0) % tb, tx and tp must be real and positive
     info = 0;
   end
 

diff --git a/docs/sys/toolbar_DEBtool_IUEM.html b/docs/sys/toolbar_DEBtool_IUEM.html
@@ -70,7 +70,7 @@
           <a href="https://debtheory.fr/add_my_pet/pie_pSGJRi.html">Energy Budgets</a>
           <a href="https://debtheory.fr/add_my_pet/ecoCodes.html">EcoCodes</a>
           <a href="https://debtheory.fr/add_my_pet/links.html">Links</a>
-          <a href="https://debtheory.fr/add_my_pet/AmPdata/AmPdata.zip"><table><tr> <td rowspan="2"><IMG SRC="https://debtheory.fr/add_my_pet/img/zipicon.png" WIDTH="30px"  BORDER="0"></td><td>AmPdata</td></tr><tr><td>20250219</td></tr></table></a>
+          <a href="https://debtheory.fr/add_my_pet/AmPdata/AmPdata.zip"><table><tr> <td rowspan="2"><IMG SRC="https://debtheory.fr/add_my_pet/img/zipicon.png" WIDTH="30px"  BORDER="0"></td><td>AmPdata</td></tr><tr><td>20250220</td></tr></table></a>
         </div>
       </div>
 

diff --git a/docs/sys/toolbar_DEBtool_VU.html b/docs/sys/toolbar_DEBtool_VU.html
@@ -70,7 +70,7 @@
           <a href="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/pie_pSGJRi.html">Energy Budgets</a>
           <a href="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/ecoCodes.html">EcoCodes</a>
           <a href="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/links.html">Links</a>
-          <a href="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/AmPdata/AmPdata.zip"><table><tr> <td rowspan="2"><IMG SRC="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/img/zipicon.png" WIDTH="30px"  BORDER="0"></td><td>AmPdata</td></tr><tr><td>20250219</td></tr></table></a>
+          <a href="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/AmPdata/AmPdata.zip"><table><tr> <td rowspan="2"><IMG SRC="https://www.bio.vu.nl/thb/deb/deblab/add_my_pet/img/zipicon.png" WIDTH="30px"  BORDER="0"></td><td>AmPdata</td></tr><tr><td>20250220</td></tr></table></a>
         </div>
       </div>