diff --git a/CHANGES b/CHANGES index c8e28d2f248b5a9d78f9c8a825f1be3a88d97964..4c683ba9c18641216e0f496f849322e2891862f3 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,12 @@ V2.1.6 Add binary_c_help API function (for David). +Updates to meson build to fix dependency issues (e.g. for docker and Fedora) and add some documentation. Please keep reporting problems on different platforms. + +Updates to Docker build for meson compatibility. + +Documentation updates (thanks to all, especially Nina and David). + V2.1.5 Updates to the meson build to make it more efficient and work on more platforms. diff --git a/doc/binary_c-API.lyx b/doc/binary_c-API.lyx index 460a6a409954894677b9b0be2a0bca266f40a009..9178bf25fc130a06f5831e5de5f5247f56b3f00d 100644 --- a/doc/binary_c-API.lyx +++ b/doc/binary_c-API.lyx @@ -2618,7 +2618,7 @@ Extension functions \begin_layout Standard A few functions have been defined which provide extensions to the basic - API, but are very useful in the + API and are very useful in the \begin_inset Flex Perlmodule status open @@ -2628,7 +2628,7 @@ binary_grid::C \end_inset - Perl module. + Perl module or the assoicated Python module. The number of extension functions may increase in the future, so this documenta tion is always likely to be out of date. \end_layout @@ -2844,6 +2844,118 @@ reference "subsec:binary_c_new_system" ) \end_layout +\begin_layout Subsubsection +binary_c_help +\begin_inset CommandInset label +LatexCommand label +name "subsec:binary_c_help" + +\end_inset + + +\end_layout + +\begin_layout Standard +This function outputs the help associated with +\begin_inset Flex CVar +status open + +\begin_layout Plain Layout +argstring +\end_layout + +\end_inset + + using Printf (i.e. +\begin_inset space ~ +\end_inset + +to the screen or into +\begin_inset Formula $\binaryc$ +\end_inset + +'s +\begin_inset Flex CVar +status open + +\begin_layout Plain Layout +raw_buffer +\end_layout + +\end_inset + + depending on how you have set +\begin_inset Flex CVar +status open + +\begin_layout Plain Layout +stardata->preferences->internal_buffering +\end_layout + +\end_inset + +). +\end_layout + +\begin_layout Standard +\begin_inset listings +lstparams "language=C" +inline false +status open + +\begin_layout Plain Layout + +void binary_c_API_function binary_c_help(struct stardata_t * RESTRICT const + stardata, +\end_layout + +\begin_layout Plain Layout + + char * argstring) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Flex CStruct +status open + +\begin_layout Plain Layout +stardata +\end_layout + +\end_inset + + is defined previously (Sec. +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:binary_c_new_system" + +\end_inset + +). +\end_layout + +\begin_layout Itemize +\begin_inset Flex CVar +status open + +\begin_layout Plain Layout +argstring +\end_layout + +\end_inset + + is a string provided by the user. +\end_layout + \begin_layout Subsection API Examples \begin_inset CommandInset label @@ -3118,12 +3230,7 @@ status open \begin_layout Plain Layout - stardata->preferences->internal_buffering = 2; -\end_layout - -\begin_layout Plain Layout - - stardata->preferences->internal_buffering_compression = 0; + stardata->preferences->internal_buffering = INTERNAL_BUFFERING_STORE; \end_layout \begin_layout Plain Layout diff --git a/doc/binary_c2.lyx b/doc/binary_c2.lyx index 6134964036873002789c32a71d8052d5effd59a9..69cbd1d4a8a6039db8d27fbfdf5092966976421f 100644 --- a/doc/binary_c2.lyx +++ b/doc/binary_c2.lyx @@ -569,7 +569,7 @@ An introduction to the \begin_inset Newline newline \end_inset -Version 2.1.5 +Version 2.1.6 \begin_inset Newline newline \end_inset @@ -11152,6 +11152,86 @@ printf for processing and statistical analysis. \end_layout +\begin_layout Standard +When you output with +\begin_inset Flex CMacro +status open + +\begin_layout Plain Layout +Printf +\end_layout + +\end_inset + + your output either goes into a buffer or to the screen, according to the + parameter +\begin_inset Flex CVar +status open + +\begin_layout Plain Layout +stardata->preferences->internal_buffering +\end_layout + +\end_inset + +. + You can access the buffer either through the internal +\begin_inset Flex CFunction +status open + +\begin_layout Plain Layout +buffer_info +\end_layout + +\end_inset + + function, or the API's +\begin_inset Flex CFunction +status open + +\begin_layout Plain Layout +binary_c_buffer_info +\end_layout + +\end_inset + + function. +\end_layout + +\begin_layout Description +INTERNAL_BUFFERING_OFF Output to +\begin_inset Flex File +status open + +\begin_layout Plain Layout +stdout +\end_layout + +\end_inset + + (no buffer is stored). +\end_layout + +\begin_layout Description +INTERNAL_BUFFERING_PRINT Store in the buffer and dump the buffer's contents + to +\begin_inset Flex File +status open + +\begin_layout Plain Layout +stdout +\end_layout + +\end_inset + + at the end of each timestep. +\end_layout + +\begin_layout Description +INTERNAL_BUFFERING_STORE Store in the buffer for later use (this is probably + what you want if you are using the API). +\end_layout + \begin_layout Subsubsection common_envelope \end_layout diff --git a/doc/binary_c2.pdf b/doc/binary_c2.pdf index daf97d3f9842f766039b9a4f5f838af237695972..9837e3feaea0a8ec2d7c9652af9354535417c7e9 100644 Binary files a/doc/binary_c2.pdf and b/doc/binary_c2.pdf differ diff --git a/meson.build b/meson.build index e3373469977c743c2838167ef2d16d58df584a9c..7e07cad1129d14bf16dbf9855e0eaaec20e39c78 100644 --- a/meson.build +++ b/meson.build @@ -651,11 +651,14 @@ cflags += warn_flags ############################################################ # append library locations to cflags +# (note: clang does not support this syntax) # -foreach libdir : libdirs - _l = '-L' + libdir - cflags += _l -endforeach +if compiler.get_id() != 'clang' + foreach libdir : libdirs + _l = '-L' + libdir + cflags += _l + endforeach +endif ############################################################ # make precompiled headers (PCH)