Skip to content

Commit

Permalink
Merge pull request #26 from vincentcasseau/main
Browse files Browse the repository at this point in the history 
FastS, Fast: install fixes
  • Loading branch information
@vincentcasseau
vincentcasseau authored Oct 30, 2024
2 parents 14bf961 + a0ad30a commit d6b5dc7
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
5 changes: 3 additions & 2 deletions Fast/Fast/Fast/computePT.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,8 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)
//printf("thread =%d\n",threadmax_sdm);
FldArrayI ijkv_sdm( 3*threadmax_sdm); E_Int* ipt_ijkv_sdm = ijkv_sdm.begin();
FldArrayI topology( 3*threadmax_sdm); E_Int* ipt_topology = topology.begin();
FldArrayI ind_CL( 24*threadmax_sdm); E_Int* ipt_ind_CL = ind_CL.begin();
FldArrayI ind_CL( 18*threadmax_sdm); E_Int* ipt_ind_CL = ind_CL.begin();
FldArrayI shift_lu( nidom*6*threadmax_sdm); E_Int* ipt_shift_lu = shift_lu.begin();
FldArrayI ind_dm_omp( 12*threadmax_sdm); E_Int* ipt_ind_dm_omp = ind_dm_omp.begin();

FldArrayI tab_verrou_lhs(2*mx_nidom*threadmax_sdm); E_Int* verrou_lhs = tab_verrou_lhs.begin();
Expand Down Expand Up @@ -676,7 +677,7 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args)
layer_mode , mpi , nisdom_lu_max ,
mx_nidom , ndimt_flt , threadmax_sdm , mx_synchro ,
nb_pulse , temps , ipt_ijkv_sdm , ipt_ind_dm_omp , iptdtloc ,
ipt_topology , ipt_ind_CL , ipt_lok , verrou_lhs ,
ipt_topology , ipt_ind_CL , ipt_shift_lu , ipt_lok , verrou_lhs ,
vartype , timer_omp , iptludic , iptlumax ,
ipt_ind_dm , ipt_it_lu_ssdom , ipt_ng_pe , ipt_nfconn ,
ipt_nfindex , ipt_VectG , ipt_VectY , iptssor ,
Expand Down
2 changes: 1 addition & 1 deletion Fast/Fast/Fast/fast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void compute_sij( E_Float**& ipt_ro , E_Float**& iptS , E_Float**& ipt_
E_Int& layer_mode , E_Int& mpi , E_Int& nisdom_lu_max ,
E_Int& mx_nidom , E_Int& ndimt_flt , E_Int& threadmax_sdm , E_Int& mx_synchro ,
E_Int& nb_pulse , E_Float& temps , E_Int* ipt_ijkv_sdm , E_Int* ipt_ind_dm_omp , E_Int* iptdtloc,
E_Int* ipt_topology , E_Int* ipt_ind_CL , E_Int* ipt_lok , E_Int* verrou_lhs ,
E_Int* ipt_topology , E_Int* ipt_ind_CL , E_Int* ipt_shift_lu , E_Int* ipt_lok , E_Int* verrou_lhs ,
E_Int& vartype , E_Float* timer_omp , E_Int* iptludic , E_Int* iptlumax ,
E_Int** ipt_ind_dm , E_Int** ipt_it_lu_ssdom , E_Int** ipt_ng_pe , E_Int** ipt_nfconn ,
E_Int** ipt_nfindex , E_Float* ipt_VectG , E_Float* ipt_VectY , E_Float** ipt_ssor ,
Expand Down
25 changes: 12 additions & 13 deletions Fast/Fast/Fast/gsdr3.cpp
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ E_Float time_init;
//E_Float time_COM=0.0;
//E_Float time_init;

E_Int K_FAST::gsdr3(E_Int**& param_int , E_Float**& param_real , E_Int& nidom , E_Int& nitrun ,
E_Int& nitcfg , E_Int& nitcfg_last , E_Int& nssiter , E_Int& it_target ,
E_Int& first_it , E_Int& kimpli , E_Int& lssiter_verif , E_Int& lexit_lu ,
E_Int& layer_mode , E_Int& mpi , E_Int& nisdom_lu_max ,
E_Int& mx_nidom , E_Int& ndimt_flt , E_Int& threadmax_sdm , E_Int& mx_synchro ,
E_Int& nb_pulse , E_Float& temps , E_Int* ipt_ijkv_sdm , E_Int* ipt_ind_dm_omp , E_Int* iptdtloc ,
E_Int* ipt_topology , E_Int* ipt_ind_CL , E_Int* ipt_lok , E_Int* verrou_lhs ,
E_Int& vartype , E_Float* timer_omp , E_Int* iptludic , E_Int* iptlumax ,
E_Int** ipt_ind_dm , E_Int** ipt_it_lu_ssdom , E_Int** ipt_ng_pe , E_Int** ipt_nfconn ,
E_Int** ipt_nfindex , E_Float* ipt_VectG , E_Float* ipt_VectY , E_Float** iptssor ,
E_Float** iptssortmp , E_Int* ipt_ssor_size , E_Float* ipt_drodmd , E_Float* ipt_Hessenberg ,
E_Float** iptkrylov , E_Float** iptkrylov_transfer, E_Float* ipt_norm_kry , E_Float** ipt_gmrestmp ,
E_Int K_FAST::gsdr3(E_Int**& param_int , E_Float**& param_real , E_Int& nidom , E_Int& nitrun ,
E_Int& nitcfg , E_Int& nitcfg_last , E_Int& nssiter , E_Int& it_target ,
E_Int& first_it , E_Int& kimpli , E_Int& lssiter_verif , E_Int& lexit_lu ,
E_Int& layer_mode , E_Int& mpi , E_Int& nisdom_lu_max ,
E_Int& mx_nidom , E_Int& ndimt_flt , E_Int& threadmax_sdm , E_Int& mx_synchro ,
E_Int& nb_pulse , E_Float& temps , E_Int* ipt_ijkv_sdm , E_Int* ipt_ind_dm_omp , E_Int* iptdtloc ,
E_Int* ipt_topology , E_Int* ipt_ind_CL , E_Int* shift_lu , E_Int* ipt_lok , E_Int* verrou_lhs ,
E_Int& vartype , E_Float* timer_omp , E_Int* iptludic , E_Int* iptlumax ,
E_Int** ipt_ind_dm , E_Int** ipt_it_lu_ssdom , E_Int** ipt_ng_pe , E_Int** ipt_nfconn ,
E_Int** ipt_nfindex , E_Float* ipt_VectG , E_Float* ipt_VectY , E_Float** iptssor ,
E_Float** iptssortmp , E_Int* ipt_ssor_size , E_Float* ipt_drodmd , E_Float* ipt_Hessenberg ,
E_Float** iptkrylov , E_Float** iptkrylov_transfer, E_Float* ipt_norm_kry , E_Float** ipt_gmrestmp ,
E_Float* ipt_givens , E_Float* ipt_cfl , E_Float** iptx , E_Float** ipty ,
E_Float** iptz , E_Float** iptCellN , E_Float** iptCellN_IBC , E_Float** iptFltrN , E_Float** iptSpongeCoef, E_Int** ipt_degen ,
E_Float**& iptro , E_Float**& iptro_m1 , E_Float**& iptrotmp , E_Float**& iptrof , E_Float**& iptS , E_Float**& iptPsiG,
Expand Down Expand Up @@ -214,7 +214,6 @@ E_Int rank =0;
E_Int* ipt_ind_CL_thread = ipt_ind_CL + (ithread-1)*6;
E_Int* ipt_ind_CL119 = ipt_ind_CL + (ithread-1)*6 + 6*Nbre_thread_actif;
E_Int* ipt_ind_CLgmres = ipt_ind_CL + (ithread-1)*6 + 12*Nbre_thread_actif;
E_Int* ipt_shift_lu = ipt_ind_CL + (ithread-1)*6 + 18*Nbre_thread_actif;
E_Int* ipt_ind_dm_socket = ipt_ind_dm_omp + (ithread-1)*12;
E_Int* ipt_ind_dm_omp_thread = ipt_ind_dm_socket + 6;

Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModelSA_i.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( ir , j, k )
ldl = inddm( ir +sens , j, k )
ldnp = inddm( ir +sens*2, j, k )
ldl = inddm( ir +sens_int , j, k )
ldnp = inddm( ir +sens_int*2, j, k )
ldnm = ldjr

m = ldjr - exchange
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModelSA_j.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( i, jr , k )
ldl = inddm( i, jr +sens , k )
ldnp = inddm( i, jr +sens*2, k )
ldl = inddm( i, jr +sens_int , k )
ldnp = inddm( i, jr +sens_int*2, k )
ldnm = ldjr

m = ldjr - exchange
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModelSA_k.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( i, j, kr )
ldl = inddm( i, j, kr +sens )
ldnp = inddm( i, j, kr +sens*2 )
ldl = inddm( i, j, kr +sens_int )
ldnp = inddm( i, j, kr +sens_int*2 )
ldnm = ldjr

m = ldjr - exchange
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModel_i.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( ir , j, k )
ldl = inddm( ir +sens , j, k )
ldnp = inddm( ir +sens*2, j, k )
ldl = inddm( ir +sens_int , j, k )
ldnp = inddm( ir +sens_int*2, j, k )
ldnm = ldjr

m = ldjr - exchange
Expand Down
2 changes: 1 addition & 1 deletion Fast/FastS/FastS/BC/BCWallModel_init.for
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exchange = 1 - sampling ! index correction for identifying the correct cell

sens = 1.
sens_int = 1.
sens_int = 1
shift = 0
if(mod(idir,2).eq.0) then
sens = -1.
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModel_j.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( i, jr , k )
ldl = inddm( i, jr +sens , k )
ldnp = inddm( i, jr +sens*2, k )
ldl = inddm( i, jr +sens_int , k )
ldnp = inddm( i, jr +sens_int*2, k )
ldnm = ldjr

m = ldjr - exchange
Expand Down
4 changes: 2 additions & 2 deletions Fast/FastS/FastS/BC/BCWallModel_k.for
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ldjr = inddm( i, j, kr )
ldl = inddm( i, j, kr +sens )
ldnp = inddm( i, j, kr +sens*2)
ldl = inddm( i, j, kr +sens_int )
ldnp = inddm( i, j, kr +sens_int*2)
ldnm = ldjr

m = ldjr - exchange
Expand Down

0 comments on commit d6b5dc7

Please sign in to comment.