Skip to content

Commit 25cf8ea

Browse files
riederrieder
authored
Merge branch 'main' into examples_book_v2
2 parents 006f69a + bc64e81 commit 25cf8ea

209 files changed

Lines changed: 1603 additions & 304 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/developing/documenting.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It's easiest to install the required packages using Conda:
1414

1515
.. code-block:: bash
1616
17-
conda install jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf
17+
conda install -c conda-forge --override-channels jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf
1818
1919
.. _Sphinx: http://www.sphinx-doc.org/en/master/
2020

‎doc/install/development.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ available from every popular package manager. In your Conda environment,
1616

1717
.. code-block:: bash
1818
19-
conda install git
19+
conda install -c conda-forge --override-channels git
2020
2121
will get you sorted. Next, you can get a local git repository with AMUSE in it using
2222

‎doc/install/installing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ well. Fortunately, ``conda`` can help us here too:
194194

195195
.. code-block:: bash
196196
197-
conda install scipy astropy jupyter pandas seaborn matplotlib
197+
conda install -c conda-forge --override-channels scipy astropy jupyter pandas seaborn matplotlib
198198
199199
200200
Fixing MPI on Ubuntu

‎lib/amuse_mpi/support/aclocal.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313

1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_include([shared/m4/amuse_detect_os.m4])
16+
m4_include([shared/m4/amuse_log_envvars.m4])
1617
m4_include([shared/m4/ax_mpi.m4])

‎lib/amuse_mpi/support/configure‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,6 +2326,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
23262326

23272327

23282328

2329+
amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS"
2330+
2331+
printf "%s\n" "=== Shell environment ==="
2332+
2333+
for amuse_le_var in ${amuse_le_vars}
2334+
do
2335+
eval "amuse_le_val=\${$amuse_le_var}"
2336+
printf "%s\n" "${amuse_le_var}=${amuse_le_val}"
2337+
done
2338+
printf "%s\n" "=== End shell environment ==="
2339+
2340+
2341+
23292342

23302343

23312344
# Make sure we can run config.sub.

‎lib/amuse_mpi/support/configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
AC_CONFIG_MACRO_DIRS([shared/m4])
22
AC_INIT([amuse-lib-amuse_mpi], [1.0])
33

4+
AMUSE_LOG_ENVVARS()
5+
46
AMUSE_DETECT_OS()
57

68
AC_PROG_CC()

‎lib/forsockets/support/aclocal.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313

1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_include([shared/m4/amuse_detect_os.m4])
16+
m4_include([shared/m4/amuse_log_envvars.m4])
1617
m4_include([shared/m4/fortran.m4])

‎lib/forsockets/support/configure‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,6 +2304,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
23042304
23052305
23062306
2307+
amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS"
2308+
2309+
printf "%s\n" "=== Shell environment ==="
2310+
2311+
for amuse_le_var in ${amuse_le_vars}
2312+
do
2313+
eval "amuse_le_val=\${$amuse_le_var}"
2314+
printf "%s\n" "${amuse_le_var}=${amuse_le_val}"
2315+
done
2316+
printf "%s\n" "=== End shell environment ==="
2317+
2318+
2319+
23072320
23082321
23092322
# Make sure we can run config.sub.

‎lib/forsockets/support/configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
AC_CONFIG_MACRO_DIRS([shared/m4])
22
AC_INIT([amuse-lib-forsockets], [1.0])
33

4+
AMUSE_LOG_ENVVARS()
5+
46
AMUSE_DETECT_OS()
57

68
AC_PROG_CC()

‎lib/g6lib/support/aclocal.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313

1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_include([shared/m4/amuse_detect_os.m4])
16+
m4_include([shared/m4/amuse_log_envvars.m4])

0 commit comments

Comments
 (0)