From e972c01cb3d73a149de1312abe81a96b3a89746a Mon Sep 17 00:00:00 2001 From: Paul BIGNIER Date: Fri, 23 Aug 2013 16:24:19 +0200 Subject: [PATCH] Differential_equations doc: warning fix Removed deprecated use of fifth argument of ilib_for_link. See http://help.scilab.org/docs/5.4.1/fr_FR/ilib_for_link.html , "This parameter is useless since Scilab 5.0." "A warning will be displayed in Scilab 5.3 if you use another value that the default." Change-Id: Ie42345c22c7ced4aefc5fbac27846f849687c3f0 --- .../differential_equations/help/en_US/dae.xml | 38 ++++++++-------- .../differential_equations/help/en_US/ode.xml | 2 +- .../differential_equations/help/fr_FR/ode.xml | 2 +- .../differential_equations/help/ja_JP/dae.xml | 46 ++++++++++---------- .../differential_equations/help/ja_JP/ode.xml | 38 ++++++++-------- .../differential_equations/help/pt_BR/dae.xml | 36 +++++++-------- .../differential_equations/help/pt_BR/ode.xml | 24 +++++----- .../differential_equations/help/ru_RU/dae.xml | 44 +++++++++---------- .../differential_equations/help/ru_RU/ode.xml | 2 +- 9 files changed, 116 insertions(+), 116 deletions(-) diff --git a/scilab/modules/differential_equations/help/en_US/dae.xml b/scilab/modules/differential_equations/help/en_US/dae.xml index 64bb59a..3618f9c 100644 --- a/scilab/modules/differential_equations/help/en_US/dae.xml +++ b/scilab/modules/differential_equations/help/en_US/dae.xml @@ -3,11 +3,11 @@ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008 - INRIA * ... - * + * * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at + * are also available at * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * --> @@ -18,7 +18,7 @@ Calling Sequence - y=dae(initial,t0,t,res) + y=dae(initial,t0,t,res) [y [,hd]]=dae(initial,t0,t [,rtol, [atol]],res [,jac] [,hd]) [y,rd]=dae("root",initial,t0,t,res,ng,surface) [y ,rd [,hd]]=dae("root",initial,t0,t [,rtol, [atol]],res [,jac], ng, surface [,hd]) @@ -50,7 +50,7 @@ a real scalar or vector. Gives instants for which you want the solution. Note that you can get solution at each dae's step point by - setting + setting %DAEOPTIONS(2)=1 @@ -117,13 +117,13 @@ This form of external is used to pass parameters to the function. It must be as follows: - where the calling sequence of the function res is now - @@ -243,14 +243,14 @@ r=res(t,y,ydot,p1,p2,...) This form of external is used to pass parameters to the function. It must be as follows: - where the calling sequence of the function jac is now - jac still returns @@ -328,13 +328,13 @@ r=jac(t,x,xdot,p1,p2,...) This form of external is used to pass parameters to the function. It must be as follows: - where the calling sequence of the function surface is now - @@ -390,7 +390,7 @@ r=surface(t,x,p1,p2,...) rd - a vector with two entries [times num] where + a vector with two entries [times num] where times is the value of the time at which the surface is crossed, num is the number of the crossed surface @@ -410,7 +410,7 @@ r=surface(t,x,p1,p2,...) y - a real matrix. If + a real matrix. If %DAEOPTIONS(2)=1 @@ -431,12 +431,12 @@ r=surface(t,x,p1,p2,...) dassl and dasrt function designed for implicit differential equations integration. - - If xdot0 is not given in the initial + If xdot0 is not given in the initial argument, the dae function tries to compute it solving g(t,x0,xdot0)=0. @@ -452,7 +452,7 @@ x(t0)=x0 and xdot(t0)=xdot0 Examples - ' previous_dir = pwd(); cd TMPDIR; mputl(code, 't22.c') -ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c','Makefile','t22loader.sce'); +ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c',[],'t22loader.sce'); exec('t22loader.sce') rtol=[1.d-6;1.d-6]; atol=[1.d-6;1.d-4]; diff --git a/scilab/modules/differential_equations/help/en_US/ode.xml b/scilab/modules/differential_equations/help/en_US/ode.xml index 7f1f612..125ff29 100644 --- a/scilab/modules/differential_equations/help/en_US/ode.xml +++ b/scilab/modules/differential_equations/help/en_US/ode.xml @@ -549,7 +549,7 @@ ccode=['#include ' '}'] mputl(ccode,TMPDIR+'/myode.c') //create the C file // Compile -ilib_for_link('myode','myode.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/loader.sce'); +ilib_for_link('myode','myode.c',[],'c',[],TMPDIR+'/loader.sce'); exec(TMPDIR+'/loader.sce') //incremental linking y0=0; t0=0; diff --git a/scilab/modules/differential_equations/help/fr_FR/ode.xml b/scilab/modules/differential_equations/help/fr_FR/ode.xml index 308feda..c4ac736 100644 --- a/scilab/modules/differential_equations/help/fr_FR/ode.xml +++ b/scilab/modules/differential_equations/help/fr_FR/ode.xml @@ -374,7 +374,7 @@ ccode=['#include ' ' ydot[0]=y[0]*y[0]-y[0]*sin(*t)+cos(*t);' '}'] mputl(ccode,TMPDIR+'/myode.c') //create the C file -ilib_for_link('myode','myode.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/loader.sce');//compile +ilib_for_link('myode','myode.c',[],'c',[],TMPDIR+'/loader.sce');//compile exec(TMPDIR+'/loader.sce') //incremental linking y0=0;t0=0;t=0:0.1:%pi; y=ode(y0,t0,t,'myode'); diff --git a/scilab/modules/differential_equations/help/ja_JP/dae.xml b/scilab/modules/differential_equations/help/ja_JP/dae.xml index 3b97bbc..701adac 100644 --- a/scilab/modules/differential_equations/help/ja_JP/dae.xml +++ b/scilab/modules/differential_equations/help/ja_JP/dae.xml @@ -3,11 +3,11 @@ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008 - INRIA * ... - * + * * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at + * are also available at * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * --> @@ -18,7 +18,7 @@ 呼び出し手順 - y=dae(initial,t0,t,res) + y=dae(initial,t0,t,res) [y [,hd]]=dae(initial,t0,t [,rtol, [atol]],res [,jac] [,hd]) [y,rd]=dae("root",initial,t0,t,res,ng,surface) [y ,rd [,hd]]=dae("root",initial,t0,t [,rtol, [atol]],res [,jac], ng, surface [,hd]) @@ -82,7 +82,7 @@ res - 外部ルーチン. + 外部ルーチン. g(t,y,ydot)の値を計算します. 以下のようになります @@ -93,7 +93,7 @@ [r,ires]=res(t,x,xdot) とする 必要があり,res は 残差r=g(t,x,xdot) とエラーフラグ - iresを返す必要があります. + iresを返す必要があります. resがrの計算に 成功した場合にはires = 0, (t,x,xdot)のローカルな残差が定義されない @@ -109,13 +109,13 @@ 関数にパラメータを指定する際に使用されます. 以下のような形式とします: - ただし,ここで関数resの呼び出し手順は以下のようになります - @@ -203,7 +203,7 @@ r=res(t,y,ydot,p1,p2,...) jac - 外部ルーチン. + 外部ルーチン. 指定したパラメータの値 cjを用いて dg/dx+cj*dg/dxdotの値を計算します. 以下のようになります @@ -228,15 +228,15 @@ r=res(t,y,ydot,p1,p2,...) 関数にパラメータを指定する際に使用されます. 以下のような形式とします: - ただしこの場合の関数jacの呼び出し手順は 以下となります - この場合でもjac は, @@ -289,9 +289,9 @@ r=jac(t,x,xdot,p1,p2,...) surface - 外部ルーチン. + 外部ルーチン. ng個の要素を有する列ベクトル - surface(t,x)の値を計算します. + surface(t,x)の値を計算します. 各要素は面(surface)を定義します. @@ -312,14 +312,14 @@ r=jac(t,x,xdot,p1,p2,...) 関数にパラメータを指定する際に使用されます. 以下のような形式とします: - ただしこの場合の関数surfaceの呼び出し手順は 以下となります - @@ -358,7 +358,7 @@ r=surface(t,x,p1,p2,...) ただし,t, x, rpar, ipar は 上記と同じ定義を有し,ng は - surfacesの数, nx は状態量の次元, + surfacesの数, nx は状態量の次元, r は結果の配列です. @@ -379,7 +379,7 @@ r=surface(t,x,p1,p2,...) hd - 実数のベクトル, + 実数のベクトル, dae コンテキストを保持する出力. (ホットスタートで)積分を再開するための入力引数として使用可能です. @@ -389,7 +389,7 @@ r=surface(t,x,p1,p2,...) y - 実数の行列. + 実数の行列. %DAEOPTIONS(2)=1 @@ -411,7 +411,7 @@ r=surface(t,x,p1,p2,...) dassl および dasrt 関数の上位に構築されたゲートウエイです. - @@ -437,7 +437,7 @@ x(t0)=x0 and xdot(t0)=xdot0 例 - ' ' ' 'void gr22(int *neq, double *t, double *y, int *ng, double *groot, double *rpar, int *ipar)' '{ groot[0] = y[0];}'] -mputl(code,TMPDIR+'/t22.c') +mputl(code,TMPDIR+'/t22.c') //-2- コンパイルの後,ロード -ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/t22loader.sce'); +ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c',[],TMPDIR+'/t22loader.sce'); exec(TMPDIR+'/t22loader.sce') //-3- 実行 rtol=[1.d-6;1.d-6];atol=[1.d-6;1.d-4]; diff --git a/scilab/modules/differential_equations/help/ja_JP/ode.xml b/scilab/modules/differential_equations/help/ja_JP/ode.xml index 7c794bb..709fb51 100644 --- a/scilab/modules/differential_equations/help/ja_JP/ode.xml +++ b/scilab/modules/differential_equations/help/ja_JP/ode.xml @@ -170,7 +170,7 @@ "root": 解を得る機能を有するODE ソルバ. ODEPACKパッケージの - lsodar ソルバが使用されます. + lsodar ソルバが使用されます. 使用されているのはlsoda ソルバを改変したもので, 指定したベクトル関数の根を見つけることができます. 詳細は ode_root のヘルプを参照してください. @@ -195,7 +195,7 @@ odeの最も簡単なコールは次のようになります: y=ode(y0,t0,t,f) ただし y0 は - 初期条件のベクトル,t0 は初期時間, + 初期条件のベクトル,t0 は初期時間, t は解yを計算する時間のベクトル, yは解ベクトルの行列y=[y(t(1)),y(t(2)),...] です. @@ -209,22 +209,22 @@ - f が Scilab 関数の場合, + f が Scilab 関数の場合, その構文は ydot = f(t,y)となります. ただし,tは実数スカラー(時間), - y は実数ベクトル (状態量), + y は実数ベクトル (状態量), ydotは実数ベクトル (dy/dt)です. - f が文字列の場合, + f が文字列の場合, FortranサブルーチンまたはC関数の名前が参照されます. すなわち,ode(y0,t0,t,"fex")がコマンドの 場合,サブルーチンfexがコールされます. Fortranルーチンは以下の呼び出し手順とする - 必要があります: fex(n,t,y,ydot), + 必要があります: fex(n,t,y,ydot), ただし n は整数, t は倍精度実数, y と ydot は倍精度ベクトルです. C 関数は以下のプロトタイプとする必要があります: @@ -274,7 +274,7 @@ オプションの入力パラメータとして次の - 解の誤差を指定できます: + 解の誤差を指定できます: 相対および絶対推定誤差の閾値である rtol および atol. y(i)の指定誤差は次のようになります: @@ -302,7 +302,7 @@ jac が関数の場合, - 構文は + 構文は J=jac(t,y)とする必要があります. @@ -318,13 +318,13 @@ 以下の呼び出し手順となります: Fortranの場合: - Cの場合: - @@ -357,7 +357,7 @@ void fex(int *n,double *t,double *y,int *ml,int *mu,double *J,int *nrpd,) 例 - ' ' ydot[0]=y[0]*y[0]-y[0]*sin(*t)+cos(*t);' '}'] mputl(ccode,TMPDIR+'/myode.c') //create the C file -ilib_for_link('myode','myode.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/loader.sce');//compile +ilib_for_link('myode','myode.c',[],'c',[],TMPDIR+'/loader.sce');//compile exec(TMPDIR+'/loader.sce') //incremental linking y0=0;t0=0;t=0:0.1:%pi; y=ode(y0,t0,t,'myode'); @@ -380,7 +380,7 @@ y=ode(y0,t0,t,'myode'); // ---------- Simulation of dx/dt = A x(t) + B u(t) with u(t)=sin(omega*t), // x0=[1;0] // solution x(t) desired at t=0.1, 0.2, 0.5 ,1. -// A and u function are passed to RHS function in a list. +// A and u function are passed to RHS function in a list. // B and omega are passed as global variables function xdot=linear(t,x,A,u),xdot=A*x+B*u(t),endfunction function ut=u(t),ut=sin(omega*t),endfunction @@ -389,22 +389,22 @@ ode([1;0],0,[0.1,0.2,0.5,1],list(linear,A,u)) // ---------- Matrix notation Integration of the Riccati differential equation // Xdot=A'*X + X*A - X'*B*X + C , X(0)=Identity -// Solution at t=[1,2] -function Xdot=ric(t,X),Xdot=A'*X+X*A-X'*B*X+C,endfunction +// Solution at t=[1,2] +function Xdot=ric(t,X),Xdot=A'*X+X*A-X'*B*X+C,endfunction A=[1,1;0,2]; B=[1,0;0,1]; C=[1,0;0,1]; t0=0;t=0:0.1:%pi; X=ode(eye(A),0,t,ric) // ---------- Matrix notation, Computation of exp(A) A=[1,1;0,2]; -function xdot=f(t,x),xdot=A*x;,endfunction +function xdot=f(t,x),xdot=A*x;,endfunction ode(eye(A),0,1,f) ode("adams",eye(A),0,1,f) // ---------- Matrix notation, Computation of exp(A) with stiff matrix, Jacobian given A=[10,0;0,-1]; -function xdot=f(t,x),xdot=A*x,endfunction -function J=Jacobian(t,y),J=A,endfunction +function xdot=f(t,x),xdot=A*x,endfunction +function J=Jacobian(t,y),J=A,endfunction ode("stiff",[0;1],0,1,f,Jacobian) ]]> diff --git a/scilab/modules/differential_equations/help/pt_BR/dae.xml b/scilab/modules/differential_equations/help/pt_BR/dae.xml index 0ee2672..726cacf 100644 --- a/scilab/modules/differential_equations/help/pt_BR/dae.xml +++ b/scilab/modules/differential_equations/help/pt_BR/dae.xml @@ -3,11 +3,11 @@ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008 - INRIA * ... - * + * * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at + * are also available at * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * --> @@ -18,7 +18,7 @@ Seqüência de Chamamento - y=dae(initial,t0,t,res) + y=dae(initial,t0,t,res) [y [,hd]]=dae(initial,t0,t [,rtol, [atol]],res [,jac] [,hd]) [y,rd]=dae("root",initial,t0,t,res,ng,surface) [y ,rd [,hd]]=dae("root",initial,t0,t [,rtol, [atol]],res [,jac], ng, surface [,hd]) @@ -50,7 +50,7 @@ escalar real ou vetor. Fornece instantes para os quais você deseja uma solução. Note que você pode obter soluções para cada - ponto de passo de dae fazendo + ponto de passo de dae fazendo %DAEOPTIONS(2)=1 @@ -109,13 +109,13 @@ Esta forma é utilizada para passar parâmetros à função. Deve ser como segue: - Onde a seqüência de chamamento da função res é agora - @@ -190,14 +190,14 @@ r=res(t,y,ydot,p1,p2,...) rpar é o array de valores de parâmetros em ponto flutuante, necessário, mas não pode - ser definido pela função dae + ser definido pela função dae ipar é o array de valores de parâmetros inteiros, necessário, mas não pode ser definido - pela função dae + pela função dae @@ -232,13 +232,13 @@ r=res(t,y,ydot,p1,p2,...) Esta forma é utilizada para passar parâmetros à função. Deve ser como segue: - Onde a seqüência de chamamento da função jac é agora - @@ -317,13 +317,13 @@ r=jac(t,x,xdot,p1,p2,...) Esta forma é utilizada para passar parâmetros à função. Deve ser como segue: - Onde a seqüência de chamamento da função surface é agora - @@ -398,7 +398,7 @@ r=surface(t,x,p1,p2,...) y - matriz de reais. Se + matriz de reais. Se %DAEOPTIONS(2)=1 @@ -419,7 +419,7 @@ r=surface(t,x,p1,p2,...) funções dassl e dasrt designada para equações diferenciais implícitas. - @@ -435,7 +435,7 @@ x(t0)=x0 e xdot(t0)=xdot0 initial ,pode ser tanto uma derivada compatível satisfazendo - g(t,x0,xdot0)=0 ou um valor aproximado . No último caso + g(t,x0,xdot0)=0 ou um valor aproximado . No último caso %DAEOPTIONS(7) deve ser ajustado para 1. @@ -448,7 +448,7 @@ x(t0)=x0 e xdot(t0)=xdot0 Exemplos - No caso Fortran: - No caso C: - @@ -358,7 +358,7 @@ void fex(int *n,double *t,double *y,int *ml,int *mu,double *J,int *nrpd,) Exemplos - ' ' ydot[0]=y[0]*y[0]-y[0]*sin(*t)+cos(*t);' '}'] mputl(ccode,TMPDIR+'/myode.c') //criando o arquivo C -ilib_for_link('myode','myode.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/loader.sce');//compilando +ilib_for_link('myode','myode.c',[],'c',[],TMPDIR+'/loader.sce');//compilando exec(TMPDIR+'/loader.sce') //linking incremental y0=0;t0=0;t=0:0.1:%pi; y=ode(y0,t0,t,'myode'); - + // ---------- Simulação de dx/dt = A x(t) + B u(t) com u(t)=sin(omega*t), // x0=[1;0] // solução x(t) desejada em t=0.1, 0.2, 0.5 ,1. -// A e a função u são passados para a função do lado direito em uma lista. +// A e a função u são passados para a função do lado direito em uma lista. // B e omega são passados como variáveis globais function xdot=linear(t,x,A,u),xdot=A*x+B*u(t),endfunction function ut=u(t),ut=sin(omega*t),endfunction @@ -390,22 +390,22 @@ ode([1;0],0,[0.1,0.2,0.5,1],list(linear,A,u)) // ---------- Integração com notação matricial da equação diferencial de Ricatti // Xdot=A'*X + X*A - X'*B*X + C , X(0)=Identity -// Solução em t=[1,2] -function Xdot=ric(t,X),Xdot=A'*X+X*A-X'*B*X+C,endfunction +// Solução em t=[1,2] +function Xdot=ric(t,X),Xdot=A'*X+X*A-X'*B*X+C,endfunction A=[1,1;0,2]; B=[1,0;0,1]; C=[1,0;0,1]; t0=0;t=0:0.1:%pi; X=ode(eye(A),0,t,ric) // ---------- Notação matricial, computação de exp(A) A=[1,1;0,2]; -function xdot=f(t,x),xdot=A*x;,endfunction +function xdot=f(t,x),xdot=A*x;,endfunction ode(eye(A),0,1,f) ode("adams",eye(A),0,1,f) // ---------- Notação de matriz, computação de exp(A) com matriz rígida, Jacobian fornecida A=[10,0;0,-1]; -function xdot=f(t,x),xdot=A*x,endfunction -function J=Jacobian(t,y),J=A,endfunction +function xdot=f(t,x),xdot=A*x,endfunction +function J=Jacobian(t,y),J=A,endfunction ode("stiff",[0;1],0,1,f,Jacobian) ]]> diff --git a/scilab/modules/differential_equations/help/ru_RU/dae.xml b/scilab/modules/differential_equations/help/ru_RU/dae.xml index cd96136..049b357 100644 --- a/scilab/modules/differential_equations/help/ru_RU/dae.xml +++ b/scilab/modules/differential_equations/help/ru_RU/dae.xml @@ -3,11 +3,11 @@ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008 - INRIA * ... - * + * * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at + * are also available at * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * --> @@ -20,8 +20,8 @@ Последовательность вызова - - y=dae(initial,t0,t,res) + + y=dae(initial,t0,t,res) [y [,hd]]=dae(initial,t0,t [,rtol, [atol]],res [,jac] [,hd]) [y,rd]=dae("root",initial,t0,t,res,ng,surface) [y ,rd [,hd]]=dae("root",initial,t0,t [,rtol, [atol]],res [,jac], ng, surface [,hd]) @@ -53,9 +53,9 @@ Вещественный скаляр или вектор. Указывает моменты времени для которых нужно найти решение. Заметьте, что вы можете получить - решение в каждой точке шага ДАУ с помощью установки + решение в каждой точке шага ДАУ с помощью установки - %DAEOPTIONS(2)=1 + %DAEOPTIONS(2)=1 . @@ -119,13 +119,13 @@ Эта форма внешней функции используется для передачи параметров в функцию. Она может иметь следующий вид: - + list(res,p1,p2,...) где последовательность вызова функции res теперь - + r=res(t,y,ydot,p1,p2,...) @@ -252,14 +252,14 @@ Эта форма внешней функции используется для передачи параметров в функцию. Она может иметь следующий вид: - - list(jac,p1,p2,...) + + list(jac,p1,p2,...) где последовательность вызова функции jac теперь - - r=jac(t,x,xdot,p1,p2,...) + + r=jac(t,x,xdot,p1,p2,...) Функция jac по-прежнему возвращает @@ -281,7 +281,7 @@ Последовательность вызова Fortran должна быть <j_name>(t, x, xdot, r, cj, ires, - rpar, ipar) + rpar, ipar) @@ -341,13 +341,13 @@ Эта форма внешней функции используется для передачи параметров в функцию. Она может иметь следующий вид: - + list(surface,p1,p2,...) где последовательность вызова функции surface теперь имеет вид: - + r=surface(t,x,p1,p2,...) @@ -365,7 +365,7 @@ Последовательность вызова Fortran должна быть <j_name>(t, x, xdot, r, cj, ires, - rpar, ipar) + rpar, ipar) @@ -427,7 +427,7 @@ y - вещественная матрица. Если + вещественная матрица. Если %DAEOPTIONS(2)=1 @@ -448,7 +448,7 @@ функциями dassl и dasrt, разработанными для явного интегрирования дифференциальных уравнений. - + g(t,x,xdot)=0 x(t0)=x0 and xdot(t0)=xdot0 @@ -490,9 +490,9 @@ endfunction x0=[1; 0; 0]; xd0=[-0.04; 0.04; 0]; t=[1.d-5:0.02:.4, 0.41:.1:4, 40, 400, 4000, 40000, 4d5, 4d6, 4d7, 4d8, 4d9, 4d10]; - + y=dae([x0,xd0],0,t,chemres);// возвращает запрошенные моменты времени наблюдения - + %DAEOPTIONS=list([],1,[],[],[],0,0); // просит вернуть сетку точек dae y=dae([x0,xd0],0,4d10,chemres); // без якобиана y=dae([x0,xd0],0,4d10,chemres,chemjac); // с якобианом @@ -525,7 +525,7 @@ cd TMPDIR; mputl(code, 't22.c') //-2- скомпилировать и загрузить его -ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c','Makefile','t22loader.sce'); +ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c',[],'t22loader.sce'); exec('t22loader.sce') //-3- запустить @@ -576,7 +576,7 @@ code=['#include ' previous_dir = pwd(); cd TMPDIR; mputl(code, 't22.c') -ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c','Makefile','t22loader.sce'); +ilib_for_link(['res22' 'jac22' 'gr22'],'t22.c',[],'c',[],'t22loader.sce'); exec('t22loader.sce') rtol=[1.d-6;1.d-6]; atol=[1.d-6;1.d-4]; diff --git a/scilab/modules/differential_equations/help/ru_RU/ode.xml b/scilab/modules/differential_equations/help/ru_RU/ode.xml index 3338115..7c746f4 100644 --- a/scilab/modules/differential_equations/help/ru_RU/ode.xml +++ b/scilab/modules/differential_equations/help/ru_RU/ode.xml @@ -546,7 +546,7 @@ ccode=['#include ' '}'] mputl(ccode,TMPDIR+'/myode.c') // создаём C-файл // Компилируем -ilib_for_link('myode','myode.c',[],'c',TMPDIR+'/Makefile',TMPDIR+'/loader.sce'); +ilib_for_link('myode','myode.c',[],'c',[],TMPDIR+'/loader.sce'); exec(TMPDIR+'/loader.sce') // пошаговая компоновка y0=0; t0=0; -- 1.7.9.5