diff --git a/.gitignore b/.gitignore index 148b59e4..ddaf7f08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode +*~ build __pycache__ *.egg-info diff --git a/Fast/Fast/Fast/computePT.cpp b/Fast/Fast/Fast/computePT.cpp index 0dc7949d..526bbabb 100644 --- a/Fast/Fast/Fast/computePT.cpp +++ b/Fast/Fast/Fast/computePT.cpp @@ -87,7 +87,7 @@ PyObject* K_FAST::_computePT(PyObject* self, PyObject* args) // // // - PyObject* pyParam_int_tc;PyObject* pyParam_real_tc; PyObject* iskipArray; + PyObject* pyParam_int_tc;PyObject* pyParam_real_tc; PyObject* iskipArray=NULL; PyObject* pyLinlets_int; PyObject* pyLinlets_real; FldArrayI* param_int_tc; FldArrayI* iskip_lu; FldArrayI* linelets_int; FldArrayF* param_real_tc; FldArrayF* linelets_real; diff --git a/Fast/Fast/doc/install b/Fast/Fast/doc/install index 32a69f85..8fbc4505 100755 --- a/Fast/Fast/doc/install +++ b/Fast/Fast/doc/install @@ -53,12 +53,15 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex Fast >& /dev/null + pdflatex Fast + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Fast/Fast/doc/source/conf.py b/Fast/Fast/doc/source/conf.py index a319943f..ab5e51a3 100644 --- a/Fast/Fast/doc/source/conf.py +++ b/Fast/Fast/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Fast/FastC/FastC/fastc.h b/Fast/FastC/FastC/fastc.h index ebb41c6a..86f3f4d3 100644 --- a/Fast/FastC/FastC/fastc.h +++ b/Fast/FastC/FastC/fastc.h @@ -44,12 +44,12 @@ namespace K_FASTC E_Int& retInt, E_Float& retFloat, char*& retChar); - PyObject* _motionlaw( PyObject* self, PyObject* args); - PyObject* PygetRange( PyObject* self, PyObject* args); - PyObject* souszones_list( PyObject* self, PyObject* args); - PyObject* distributeThreads( PyObject* self, PyObject* args); + PyObject* _motionlaw(PyObject* self, PyObject* args); + PyObject* PygetRange(PyObject* self, PyObject* args); + PyObject* souszones_list(PyObject* self, PyObject* args); + PyObject* distributeThreads(PyObject* self, PyObject* args); - PyObject* init_metric(PyObject* self, PyObject* args); + PyObject* init_metric(PyObject* self, PyObject* args); //=========== // - init Numa (optimisation placement memoire sur DRAM) @@ -99,28 +99,28 @@ namespace K_FASTC ---*/ /* Transfers FastLBM */ - void setInterpTransfersFastLBM(E_Float**& iptro_tmp , E_Int& vartype , - E_Int*& param_int_tc , E_Float*& param_real_tc , - E_Int**& param_int , E_Float**& param_real , - E_Int*& ipt_linelets_int , E_Float*& ipt_linelets_real, - E_Int& it_target , E_Int& nidom , - E_Float*& ipt_timecount , E_Int& mpi , - E_Int& nitcfg , E_Int& nssiter , - E_Int& rk , E_Int& exploc , - E_Int& numpassage , - E_Float**& ipt_macros_local, E_Float**& ipt_Qneq_local ); + void setInterpTransfersFastLBM(E_Float**& iptro_tmp , E_Int& vartype, + E_Int*& param_int_tc , E_Float*& param_real_tc , + E_Int**& param_int , E_Float**& param_real , + E_Int*& ipt_linelets_int , E_Float*& ipt_linelets_real, + E_Int& it_target , E_Int& nidom , + E_Float*& ipt_timecount , E_Int& mpi , + E_Int& nitcfg , E_Int& nssiter , + E_Int& rk , E_Int& exploc , + E_Int& numpassage , + E_Float**& ipt_macros_local, E_Float**& ipt_Qneq_local ); /* Intra process */ - void setInterpTransfersIntraLBM(E_Float**& ipt_ro , E_Int& vartype , - E_Int*& ipt_param_int , E_Float*& ipt_param_real , - E_Int**& param_int , E_Float**& param_real , - E_Int*& ipt_linelets_int , E_Float*& ipt_linelets_real, - E_Int& TypeTransfert , E_Int& nitrun , - E_Int& nidom , E_Int& NoTransfert , - E_Float*& ipt_timecount , E_Int& nitcfg , - E_Int& nssiter , E_Int& rk , - E_Int& exploc , E_Int& numpassage , - E_Float**& ipt_macros_local, E_Float**& ipt_Qneq_local ); + void setInterpTransfersIntraLBM(E_Float**& ipt_ro , E_Int& vartype, + E_Int*& ipt_param_int , E_Float*& ipt_param_real , + E_Int**& param_int , E_Float**& param_real , + E_Int*& ipt_linelets_int , E_Float*& ipt_linelets_real, + E_Int& TypeTransfert , E_Int& nitrun , + E_Int& nidom , E_Int& NoTransfert , + E_Float*& ipt_timecount , E_Int& nitcfg , + E_Int& nssiter , E_Int& rk , + E_Int& exploc , E_Int& numpassage , + E_Float**& ipt_macros_local, E_Float**& ipt_Qneq_local ); #ifdef _MPI /* Transferts FastS Inter process */ diff --git a/Fast/FastC/doc/source/conf.py b/Fast/FastC/doc/source/conf.py index 1af6401a..ed828384 100644 --- a/Fast/FastC/doc/source/conf.py +++ b/Fast/FastC/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Fast/FastS/doc/install b/Fast/FastS/doc/install index 0c5d9ec7..8359e84f 100755 --- a/Fast/FastS/doc/install +++ b/Fast/FastS/doc/install @@ -53,12 +53,15 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex FastS >& /dev/null + pdflatex FastS + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Fast/FastS/doc/source/conf.py b/Fast/FastS/doc/source/conf.py index 0b47641b..acd1dd44 100644 --- a/Fast/FastS/doc/source/conf.py +++ b/Fast/FastS/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the