[Octave-cvsupdate] SF.net SVN: octave:[5396] trunk/octave-forge/extra/nlwing2

[<hi...@us...>]

Revision: 5396
          http://octave.svn.sourceforge.net/octave/?rev=5396&view=rev
Author:   highegg
Date:     2008-11-03 12:15:05 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
version 1.0.3

Modified Paths:
--------------
    trunk/octave-forge/extra/nlwing2/ChangeLog
    trunk/octave-forge/extra/nlwing2/DESCRIPTION
    trunk/octave-forge/extra/nlwing2/inst/liftanalyze.m
    trunk/octave-forge/extra/nlwing2/inst/loadpolars.m

Modified: trunk/octave-forge/extra/nlwing2/ChangeLog
===================================================================
--- trunk/octave-forge/extra/nlwing2/ChangeLog	2008-11-01 15:58:47 UTC (rev 5395)
+++ trunk/octave-forge/extra/nlwing2/ChangeLog	2008-11-03 12:15:05 UTC (rev 5396)
@@ -1,3 +1,9 @@
+2008-11-03  Jaroslav Hajek  <hi...@gm...>
+
+	* inst/liftanalyze.m: Include polar name in warning.
+	* inst/loadpolars.m: Pass polar name to liftanalyze.
+	* DESCRIPTION: Tagged version 1.0.3.
+
 2008-10-29  Jaroslav Hajek  <hi...@gm...>
 
 	* inst/loadwing.m: keyword change: mcamber->mchord

Modified: trunk/octave-forge/extra/nlwing2/DESCRIPTION
===================================================================
--- trunk/octave-forge/extra/nlwing2/DESCRIPTION	2008-11-01 15:58:47 UTC (rev 5395)
+++ trunk/octave-forge/extra/nlwing2/DESCRIPTION	2008-11-03 12:15:05 UTC (rev 5396)
@@ -1,5 +1,5 @@
 Name: NLWing2
-Version: 1.0.2
+Version: 1.0.3
 Date: 2008-06-18
 Author: Jaroslav Hajek <hi...@gm...>
 Title: Nonlinear Lifting Line for Wings 

Modified: trunk/octave-forge/extra/nlwing2/inst/liftanalyze.m
===================================================================
--- trunk/octave-forge/extra/nlwing2/inst/liftanalyze.m	2008-11-01 15:58:47 UTC (rev 5395)
+++ trunk/octave-forge/extra/nlwing2/inst/liftanalyze.m	2008-11-03 12:15:05 UTC (rev 5396)
@@ -25,17 +25,25 @@
 % angle.
 % @end deftypefn
 
-function [a0, amax, clmax] = liftanalyze (al, cl)
+function [a0, amax, clmax] = liftanalyze (al, cl, pn = '')
+  if (pn)
+    wpref = strcat ("liftanalyze (", pn, "): ");
+  else
+    wpref = "liftanalyze: ";
+  endif
   if (cl(1) > 0)
-    warning ("liftanalyze: polar starts at positive lift");
+    warning ([wpref, "polar starts at positive lift"]);
+    warned = true;
   endif
   [clmin, imin] = min (cl);
   [clmax, imax] = max (cl);
   if (any (cl(imin+1:imax) < cl(imin:imax-1)))
-    warning ("liftanalyze: multimodal lift curve");
+    warning ([wpref, "multimodal lift curve"]);
+    warned = true;
   endif
   if (imax == length (cl))
-    warning ("liftanalyze: maximum lift at end of lift curve");
+    warning ([wpref, "maximum lift at end of lift curve"]);
+    warned = true;
   endif
   a0 = interp1 (cl(imin:imax), al(imin:imax), 0, "extrap");
   amax = al(imax);

Modified: trunk/octave-forge/extra/nlwing2/inst/loadpolars.m
===================================================================
--- trunk/octave-forge/extra/nlwing2/inst/loadpolars.m	2008-11-01 15:58:47 UTC (rev 5395)
+++ trunk/octave-forge/extra/nlwing2/inst/loadpolars.m	2008-11-03 12:15:05 UTC (rev 5396)
@@ -40,7 +40,7 @@
   if (ischar (pn))
     dat = load ('-ascii', pn);
     alpha = dat(:,1) * pi/180;
-    [a0, amax, pol.clmax] = liftanalyze (alpha, dat(:,2));
+    [a0, amax, pol.clmax] = liftanalyze (alpha, dat(:,2), pn);
     pol.a0 = a0; pol.amax = amax;
     alpha = (alpha - a0) ./ (amax - a0);
     pol.cl = pchip (alpha, dat(:,2));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.