Skip to content

FastS: purge getFromNumy + shiftzone en int64 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

FastS: purge getFromNumy + shiftzone en int64 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fast/Fast/Fast/FILTER/filtering_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ PyObject* K_FAST::filtering_(PyObject* self, PyObject* args)

//Reservation tableau travail temporaire
PyObject* drodm2Array = PyDict_GetItemString(work,"hors_eq"); FldArrayF* drodm2;
K_NUMPY::getFromNumpyArray(drodm2Array, drodm2, true); E_Float* iptroflt = drodm2->begin();
K_NUMPY::getFromNumpyArray(drodm2Array, drodm2); E_Float* iptroflt = drodm2->begin();

E_Int shift_dom = 0;
E_Int shift_roflt = 0;
Expand Down
2 changes: 1 addition & 1 deletion Fast/Fast/Fast/INTERP/interplbmns_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ PyObject* K_FAST::interplbmns_(PyObject* self, PyObject* args)
}

PyObject* dtlocArray = PyDict_GetItemString(work,"dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();
E_Int nssiter = iptdtloc[0];
E_Int omp_mode = iptdtloc[8];
E_Int shift_omp= iptdtloc[11];
Expand Down
6 changes: 3 additions & 3 deletions Fast/Fast/Fast/INTERP/recuplbmns_.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ PyObject* K_FAST::recuplbmns_(PyObject* self, PyObject* args)

/// Recuperation du tableau de stockage des valeurs
PyObject* interpArray = PyDict_GetItemString(work,"tab_interp"); FldArrayF* stk;
K_NUMPY::getFromNumpyArray(interpArray, stk, true); E_Float* iptstk = stk->begin();
K_NUMPY::getFromNumpyArray(interpArray, stk); E_Float* iptstk = stk->begin();

E_Int stk_size = stk[0].getSize();
//cout << "taille tab stockage " << stk_size << endl;
Expand All @@ -94,10 +94,10 @@ PyObject* K_FAST::recuplbmns_(PyObject* self, PyObject* args)
/* Extraction tableau int et real de tc */
/*--------------------------------------*/
FldArrayI* param_int;
E_Int res_donor = K_NUMPY::getFromNumpyArray(pyParam_int, param_int, true);
E_Int res_donor = K_NUMPY::getFromNumpyArray(pyParam_int, param_int);
E_Int* ipt_param_int = param_int->begin();
FldArrayF* param_real;
res_donor = K_NUMPY::getFromNumpyArray(pyParam_real, param_real, true);
res_donor = K_NUMPY::getFromNumpyArray(pyParam_real, param_real);
E_Float* ipt_param_real = param_real->begin();

//cout << vartype << nvars << endl;
Expand Down
40 changes: 20 additions & 20 deletions Fast/Fast/Fast/computePT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)


PyObject* dtlocArray = PyDict_GetItemString(work,"dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();
E_Int nssiter = iptdtloc[0];
E_Int shift_omp= iptdtloc[11];
E_Int* ipt_omp = iptdtloc + shift_omp;
Expand Down Expand Up @@ -105,29 +105,29 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)
pyParam_real_tc= PyDict_GetItemString(work,"param_real_tc");

if (pyParam_int_tc != Py_None)
{ K_NUMPY::getFromNumpyArray(pyParam_int_tc , param_int_tc , true); ipt_param_int_tc = param_int_tc -> begin(); }
{ K_NUMPY::getFromNumpyArray(pyParam_int_tc , param_int_tc ); ipt_param_int_tc = param_int_tc -> begin(); }
else{ ipt_param_int_tc = NULL;}

if (pyParam_real_tc != Py_None)
{ K_NUMPY::getFromNumpyArray(pyParam_real_tc, param_real_tc, true); ipt_param_real_tc= param_real_tc-> begin(); }
{ K_NUMPY::getFromNumpyArray(pyParam_real_tc, param_real_tc); ipt_param_real_tc= param_real_tc-> begin(); }
else{ ipt_param_real_tc = NULL; }

if( layer_mode ==1)
{

pyLinlets_int = PyDict_GetItemString(work,"linelets_int");
if (pyLinlets_int != Py_None)
{K_NUMPY::getFromNumpyArray(pyLinlets_int, linelets_int, true); ipt_linelets_int = linelets_int->begin();}
{K_NUMPY::getFromNumpyArray(pyLinlets_int, linelets_int); ipt_linelets_int = linelets_int->begin();}
else{ipt_linelets_int = NULL;}

pyLinlets_real = PyDict_GetItemString(work,"linelets_real");
if (pyLinlets_real != Py_None)
{K_NUMPY::getFromNumpyArray(pyLinlets_real, linelets_real, true); ipt_linelets_real = linelets_real->begin();}
{K_NUMPY::getFromNumpyArray(pyLinlets_real, linelets_real); ipt_linelets_real = linelets_real->begin();}
else{ipt_linelets_real = NULL;}


iskipArray = PyDict_GetItemString(work,"skip_lu");
K_NUMPY::getFromNumpyArray(iskipArray, iskip_lu, true); ipt_iskip_lu = iskip_lu->begin();
K_NUMPY::getFromNumpyArray(iskipArray, iskip_lu); ipt_iskip_lu = iskip_lu->begin();

PyObject* tmp1 = PyDict_GetItemString(work,"lssiter_loc");
if (PyLong_Check(tmp1) == true) lssiter_loc = PyLong_AsLong(tmp1);
Expand Down Expand Up @@ -505,58 +505,58 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)

/// Tableau pour stockage senseur oscillation
PyObject* wigArray = PyDict_GetItemString(work,"wiggle"); FldArrayF* wig;
K_NUMPY::getFromNumpyArray(wigArray, wig, true); E_Float* iptwig = wig->begin();
K_NUMPY::getFromNumpyArray(wigArray, wig); E_Float* iptwig = wig->begin();


/// Tableau de travail communs explicite/implicite
PyObject* drodmArray = PyDict_GetItemString(work,"rhs"); FldArrayF* drodm;
K_NUMPY::getFromNumpyArray(drodmArray, drodm, true); E_Float* iptdrodm = drodm->begin();
K_NUMPY::getFromNumpyArray(drodmArray, drodm); E_Float* iptdrodm = drodm->begin();

iptdrodm_transfer[0]= iptdrodm;
for (E_Int nd = 1; nd < nidom; nd++){ iptdrodm_transfer[nd]= iptdrodm_transfer[nd-1] + ipt_param_int[nd-1][NEQ]*ipt_param_int[nd-1][NDIMDX];}


// LBM : tableau de stockage pour la distribution hors equilibre
PyObject* drodm2Array = PyDict_GetItemString(work,"hors_eq"); FldArrayF* drodm2;
K_NUMPY::getFromNumpyArray(drodm2Array, drodm2, true); E_Float* f_horseq = drodm2->begin();
K_NUMPY::getFromNumpyArray(drodm2Array, drodm2); E_Float* f_horseq = drodm2->begin();

// Tableaux de travail pour HRR O2
PyObject* tab_a1prArray = PyDict_GetItemString(work,"a1_pr"); FldArrayF* tab_a1pr;
K_NUMPY::getFromNumpyArray(tab_a1prArray, tab_a1pr, true); E_Float* a1_pr = tab_a1pr->begin();
K_NUMPY::getFromNumpyArray(tab_a1prArray, tab_a1pr); E_Float* a1_pr = tab_a1pr->begin();

PyObject* tab_a1fdArray = PyDict_GetItemString(work,"a1_fd"); FldArrayF* tab_a1fd;
K_NUMPY::getFromNumpyArray(tab_a1fdArray, tab_a1fd, true); E_Float* a1_fd = tab_a1fd->begin();
K_NUMPY::getFromNumpyArray(tab_a1fdArray, tab_a1fd); E_Float* a1_fd = tab_a1fd->begin();

PyObject* tab_a1hrArray = PyDict_GetItemString(work,"a1_hr"); FldArrayF* tab_a1hr;
K_NUMPY::getFromNumpyArray(tab_a1hrArray, tab_a1hr, true); E_Float* a1_hrr = tab_a1hr->begin();
K_NUMPY::getFromNumpyArray(tab_a1hrArray, tab_a1hr); E_Float* a1_hrr = tab_a1hr->begin();

// Tableau de travail pour HRR O3
PyObject* tab_a3Array = PyDict_GetItemString(work,"aneq_3"); FldArrayF* tab_a3;
K_NUMPY::getFromNumpyArray(tab_a3Array, tab_a3, true); E_Float* aneq_o3 = tab_a3->begin();
K_NUMPY::getFromNumpyArray(tab_a3Array, tab_a3); E_Float* aneq_o3 = tab_a3->begin();

PyObject* tab_psiArray = PyDict_GetItemString(work,"psi_corr"); FldArrayF* tab_psi;
K_NUMPY::getFromNumpyArray(tab_psiArray, tab_psi, true); E_Float* psi_corr = tab_psi->begin();
K_NUMPY::getFromNumpyArray(tab_psiArray, tab_psi); E_Float* psi_corr = tab_psi->begin();


// Tableau de travail coe ( dt/vol et diags LU)
PyObject* coeArray = PyDict_GetItemString(work,"coe"); FldArrayF* coe;
K_NUMPY::getFromNumpyArray(coeArray, coe, true); E_Float* iptcoe = coe->begin();
K_NUMPY::getFromNumpyArray(coeArray, coe); E_Float* iptcoe = coe->begin();

// Tableau de travail coe ( dt/vol et diags LU)
PyObject* fluArray = PyDict_GetItemString(work,"flu_vecto"); FldArrayF* flu;
K_NUMPY::getFromNumpyArray(fluArray, flu, true); E_Float* iptflu = flu->begin();
K_NUMPY::getFromNumpyArray(fluArray, flu); E_Float* iptflu = flu->begin();

// Tableau de travail gradient
PyObject* gradArray = PyDict_GetItemString(work,"grad"); FldArrayF* grad;
K_NUMPY::getFromNumpyArray(gradArray, grad, true); E_Float* iptgrad = grad->begin();
K_NUMPY::getFromNumpyArray(gradArray, grad); E_Float* iptgrad = grad->begin();

// Tableau de travail verrou omp
PyObject* lokArray = PyDict_GetItemString(work,"verrou_omp"); FldArrayI* lok;
K_NUMPY::getFromNumpyArray(lokArray, lok, true); E_Int* ipt_lok = lok->begin();
K_NUMPY::getFromNumpyArray(lokArray, lok); E_Int* ipt_lok = lok->begin();

// Tableau de travail timer omp
PyObject* timer_omp_Array= PyDict_GetItemString(work,"TIMER_OMP"); FldArrayF* tab_timer_omp;
K_NUMPY::getFromNumpyArray(timer_omp_Array, tab_timer_omp, true); E_Float* timer_omp = tab_timer_omp->begin();
K_NUMPY::getFromNumpyArray(timer_omp_Array, tab_timer_omp); E_Float* timer_omp = tab_timer_omp->begin();


/// Recuperation du tableau de stockage dtloc
Expand All @@ -568,7 +568,7 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)
//if (ipt_param_int[0][ITYPCP]==2 and ipt_param_int[0][EXPLOC]==2 and ipt_param_int[0][RK]==3 and layer_mode ==1)
{
dtloc_stk = PyDict_GetItemString(work,"tab_dtloc");
K_NUMPY::getFromNumpyArray(dtloc_stk, stk, true); iptstk = stk->begin();
K_NUMPY::getFromNumpyArray(dtloc_stk, stk); iptstk = stk->begin();

stk_size = stk[0].getSize();
taille_tabs = stk_size/5;
Expand Down
5 changes: 3 additions & 2 deletions Fast/Fast/Fast/gsdr3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,9 @@ E_Int rank =0;
//---------------------------------------------------------------------
// -----Boucle sur num.les domaines de la configuration
// ---------------------------------------------------------------------
E_Int shift_zone=0; E_Int shift_wig=0; E_Int shift_coe=0; E_Int nd_current=0;E_Int shift_rk4=0; E_Int shift_grad=0;
E_Int shift_a1=0; E_Int shift_a3=0; E_Int shift_a4=0;
E_Int nd_current=0;
int64_t shift_zone=0; int64_t shift_wig=0; int64_t shift_coe=0; int64_t shift_grad=0;
int64_t shift_a1=0; int64_t shift_a3=0; int64_t shift_a4=0;
E_Float rhs_end=0; E_Int ncells=0;

E_Int nbtask = ipt_omp[nitcfg-1];
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastC/FastC/Compute/souszones_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ PyObject* K_FASTC::souszones_list(PyObject* self, PyObject* args)

// Tableau de parametre schema temporel
PyObject* dtlocArray = PyDict_GetItemString(work, "dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();

E_Int nidom = PyList_Size(zones);

Expand All @@ -123,7 +123,7 @@ PyObject* K_FASTC::souszones_list(PyObject* self, PyObject* args)
else mx_omp_size_int = PyInt_AsLong(tmp);

PyObject* iskipArray = PyDict_GetItemString(work,"skip_lu"); FldArrayI* iskip_lu;
K_NUMPY::getFromNumpyArray(iskipArray, iskip_lu, true); E_Int* ipt_iskip_lu = iskip_lu->begin();
K_NUMPY::getFromNumpyArray(iskipArray, iskip_lu); E_Int* ipt_iskip_lu = iskip_lu->begin();


E_Int** ipt_param_int; E_Int** ipt_ind_dm; E_Int** ipt_it_lu_ssdom; E_Float** ipt_param_real;
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastC/FastC/Init/initNuma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ PyObject* K_FASTC::initNuma(PyObject* self, PyObject* args)
}

FldArrayF* source; FldArrayF* target;
K_NUMPY::getFromNumpyArray(sourceArray, source, true); E_Float* iptsource = source->begin();
K_NUMPY::getFromNumpyArray(targetArray, target, true); E_Float* ipttarget = target->begin();
K_NUMPY::getFromNumpyArray(sourceArray, source); E_Float* iptsource = source->begin();
K_NUMPY::getFromNumpyArray(targetArray, target); E_Float* ipttarget = target->begin();


vector<PyArrayObject*> hook;
Expand Down
2 changes: 1 addition & 1 deletion Fast/FastC/FastC/Metric/init_metric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ PyObject* K_FASTC::init_metric(PyObject* self, PyObject* args)


PyObject* dtlocArray = PyDict_GetItemString(work,"dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();
E_Int nssiter = iptdtloc[0];
E_Int omp_mode = iptdtloc[8];
E_Int shift_omp= iptdtloc[11];
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastC/FastC/getRange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ PyObject* K_FASTC::PygetRange( PyObject* self, PyObject* args ) {

FldArrayI* ind_bc;
FldArrayI* param_int;
K_NUMPY::getFromNumpyArray( ind_bcArray, ind_bc, true );
K_NUMPY::getFromNumpyArray( ind_bcArray, ind_bc );
E_Int* ipt_ind_bc = ind_bc->begin( );
K_NUMPY::getFromNumpyArray( param_intArray, param_int, true );
K_NUMPY::getFromNumpyArray( param_intArray, param_int );
E_Int* ipt_param_int = param_int->begin( );

getRange( ipt_ind_bc, ipt_param_int + shift + 1, ipt_param_int );
Expand Down
3 changes: 1 addition & 2 deletions Fast/FastS/FastS/ADJOINT/compute_dpJ_dpW.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ PyObject* K_FASTS::compute_dpJ_dpW(PyObject* self, PyObject* args)

/// Tableau pour stockage senseur oscillation
PyObject* wigArray = PyDict_GetItemString(work,"wiggle"); FldArrayF* wig; FldArrayF* eff;
K_NUMPY::getFromNumpyArray(wigArray, wig, true); E_Float* iptwig = wig->begin();
// K_NUMPY::getFromNumpyArray(effarray, eff, true); E_Float* ipteff = eff->begin();
K_NUMPY::getFromNumpyArray(wigArray, wig); E_Float* iptwig = wig->begin();


///
Expand Down
2 changes: 1 addition & 1 deletion Fast/FastS/FastS/BC/applyBC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ PyObject* K_FASTS::_applyBC(PyObject* self, PyObject* args)
PyObject* tmp = PyDict_GetItemString(work,"MX_SSZONE"); E_Int mx_sszone = PyLong_AsLong(tmp);

PyObject* dtlocArray = PyDict_GetItemString(work,"dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();
E_Int nssiter = iptdtloc[0];
E_Int shift_omp= iptdtloc[11];
E_Int* ipt_omp = iptdtloc + shift_omp;
Expand Down
8 changes: 4 additions & 4 deletions Fast/FastS/FastS/BC/compute_effort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ PyObject* K_FASTS::compute_effort(PyObject* self, PyObject* args)

/// Tableau pour stockage senseur oscillation
PyObject* wigArray = PyDict_GetItemString(work,"wiggle"); FldArrayF* wig; FldArrayF* eff; FldArrayF* pos;
K_NUMPY::getFromNumpyArray(wigArray, wig, true); E_Float* iptwig = wig->begin();
K_NUMPY::getFromNumpyArray(effarray, eff, true); E_Float* ipteff = eff->begin();
K_NUMPY::getFromNumpyArray(pos_eff , pos, true); E_Float* xyz_ref= pos->begin();
K_NUMPY::getFromNumpyArray(wigArray, wig); E_Float* iptwig = wig->begin();
K_NUMPY::getFromNumpyArray(effarray, eff); E_Float* ipteff = eff->begin();
K_NUMPY::getFromNumpyArray(pos_eff , pos); E_Float* xyz_ref= pos->begin();

/// Tableau pour // omp
PyObject* dtlocArray = PyDict_GetItemString(work,"dtloc"); FldArrayI* dtloc;
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc, true); E_Int* iptdtloc = dtloc->begin();
K_NUMPY::getFromNumpyArray(dtlocArray, dtloc); E_Int* iptdtloc = dtloc->begin();
E_Int nssiter = iptdtloc[0];
E_Int omp_mode = iptdtloc[ 8 ];
E_Int shift_omp= iptdtloc[11];
Expand Down
18 changes: 0 additions & 18 deletions Fast/FastS/FastS/Compute/DTLOC/BC_local.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,10 @@ void K_FASTS::BC_local(E_Float**& iptro, E_Float**& iptro_p1, E_Int*& ipt_param_



E_Int a=0;
E_Int b=0;
E_Int* shift_zone = new E_Int[nidom];
E_Int* shift_coe = new E_Int[nidom];
E_Int process = 1;
E_Int lrhs=0; E_Int lcorner=0;
E_Int npass = 0;

for (E_Int nd = 0; nd < nidom; nd++)
{
shift_zone[nd]=a;
a=a+param_intt[nd][ NDIMDX ]*param_intt[nd][ NEQ ];
}
for (E_Int nd = 0; nd < nidom; nd++)
{
shift_coe[nd]=b;
b=b+param_intt[nd][ NDIMDX ]*param_intt[nd][ NEQ_COE ];
}

#pragma omp parallel default(shared) //private(cycle)
{
#ifdef _OPENMP
Expand Down Expand Up @@ -382,7 +367,4 @@ void K_FASTS::BC_local(E_Float**& iptro, E_Float**& iptro_p1, E_Int*& ipt_param_
}// fin zone omp


delete [] shift_zone; delete [] shift_coe;


}
52 changes: 19 additions & 33 deletions Fast/FastS/FastS/Compute/DTLOC/dtlocal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,33 +86,33 @@ PyObject* K_FASTS::dtlocal(PyObject* self, PyObject* args)

/// Recuperation du tableau de stockage des valeurs
FldArrayF* stk;
K_NUMPY::getFromNumpyArray(stock, stk, true); E_Float* iptstk = stk->begin();
K_NUMPY::getFromNumpyArray(stock, stk); E_Float* iptstk = stk->begin();

/// Recuperation du tableau de stockage des flux
FldArrayF* drodmstk;
K_NUMPY::getFromNumpyArray(drodmstock,drodmstk, true); E_Float* iptdrodmstk = drodmstk->begin();
K_NUMPY::getFromNumpyArray(drodmstock,drodmstk); E_Float* iptdrodmstk = drodmstk->begin();

/// Recuperation du tableau de stockage des flux pour conservativite
FldArrayF* cstk;
K_NUMPY::getFromNumpyArray(constk, cstk, true); E_Float* iptcstk = cstk->begin();
K_NUMPY::getFromNumpyArray(constk, cstk); E_Float* iptcstk = cstk->begin();
//// Recuperation du tableau drodm
PyObject* drodmArray = PyList_GetItem(work,2); FldArrayF* drodm;
K_NUMPY::getFromNumpyArray(drodmArray, drodm, true); E_Float* iptdrodm = drodm->begin();
K_NUMPY::getFromNumpyArray(drodmArray, drodm); E_Float* iptdrodm = drodm->begin();

/// Tableau de travail coe ( dt/vol et diags LU)
PyObject* coeArray = PyList_GetItem(work,1); FldArrayF* coe;
K_NUMPY::getFromNumpyArray(coeArray, coe, true); E_Float* iptcoe = coe->begin();
K_NUMPY::getFromNumpyArray(coeArray, coe); E_Float* iptcoe = coe->begin();



/*-------------------------------------*/
/* Extraction tableau int et real */
/*-------------------------------------*/
FldArrayI* param_int;
E_Int res_donor = K_NUMPY::getFromNumpyArray(pyParam_int, param_int, true);
E_Int res_donor = K_NUMPY::getFromNumpyArray(pyParam_int, param_int);
E_Int* ipt_param_int = param_int->begin();
FldArrayF* param_real;
res_donor = K_NUMPY::getFromNumpyArray(pyParam_real, param_real, true);
res_donor = K_NUMPY::getFromNumpyArray(pyParam_real, param_real);
E_Float* ipt_param_real = param_real->begin();

E_Int nvars;
Expand All @@ -133,34 +133,20 @@ PyObject* K_FASTS::dtlocal(PyObject* self, PyObject* args)
E_Int ech = ipt_param_int[ NoTransfert ];
E_Int nrac = ipt_param_int[ ech +1 ];
E_Int cycle;
E_Int a=0;
E_Int b=0;
E_Int shift_zone[nidomR];
E_Int shift_coe [nidomR];

for (E_Int nd = 0; nd < nidomR; nd++)
{
shift_zone[nd]=a;
a=a+param_intt[nd][ NDIMDX ]*param_intt[nd][ NEQ ];
}
for (E_Int nd = 0; nd < nidomR; nd++)
{
shift_coe[nd]=b;
b=b+param_intt[nd][ NDIMDX ]*param_intt[nd][ NEQ_COE ];
}

E_Int taille=20000000/nrac;

vector<E_Int> stockzone(nidomR,-1);
vector<E_Int> nbraczone(nidomR,0);






int64_t shift_zone[nidomR];
int64_t shift_coe[nidomR];
shift_zone[0]=0;
shift_coe[0] =0;
for (E_Int nd = 1; nd < nidomR; nd++)
{
shift_zone[nd] = shift_zone[nd-1] + param_intt[nd-1][ NDIMDX ]*param_intt[nd-1][ NEQ ];
shift_coe[nd ] = shift_coe[nd -1] + param_intt[nd-1][ NDIMDX ]*param_intt[nd-1][ NEQ_COE ];
}

E_Int taille=20000000/nrac;

vector<E_Int> stockzone(nidomR,-1);
vector<E_Int> nbraczone(nidomR,0);



Expand Down
Loading