Merge branch 'master' into magnetic_vexp

.clang-format

@@ -0,0 +1,20 @@
+{ 
+    BasedOnStyle: GNU, 
+    UseTab: Never, 
+    IndentWidth: 2, 
+    TabWidth: 4, 
+    BreakBeforeBraces: Allman, 
+    AlignAfterOpenBracket: BlockIndent,
+    AllowShortIfStatementsOnASingleLine: false, 
+    IndentCaseLabels: true, 
+    ColumnLimit: 120, 
+    AccessModifierOffset: -4, 
+    NamespaceIndentation: All, 
+    FixNamespaceComments: false,
+    AlignConsecutiveAssignments: true,
+    AlignConsecutiveMacros: true,
+    IndentPPDirectives: AfterHash,
+    SpaceAroundPointerQualifiers: Both,
+    SortIncludes: false,
+}
+

.github/workflows/build_check.yml

@@ -12,20 +12,26 @@ jobs:
 
   build-gcc-ubuntu:
     name: (ubuntu, apt)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install pre-requisites
       run: |
         sudo apt-get update
-        sudo apt-get install gobject-introspection gir1.2-glib-2.0 libgirepository1.0-dev gcc gfortran pkg-config libglib2.0-dev libgmp3-dev libmpfr-dev libgsl0-dev libfftw3-dev libopenblas-dev libflint-arb-dev libcfitsio-dev libfyaml-dev libnlopt-dev libhdf5-dev gtk-doc-tools libopenmpi-dev
-        sudo pip install meson ninja pytest pytest-tap numpy
+        sudo apt-get install gobject-introspection gir1.2-glib-2.0 libgirepository1.0-dev gcc gfortran pkg-config libglib2.0-dev libgmp3-dev libmpfr-dev libgsl0-dev libfftw3-dev libopenblas-dev libflint-dev libcfitsio-dev libfyaml-dev libnlopt-dev libhdf5-dev gtk-doc-tools libopenmpi-dev uncrustify
+        sudo pip install meson ninja pytest pytest-tap numpy --break-system-packages
     - name: Ensure clear Jupyter Notebooks
       uses: ResearchSoftwareActions/EnsureCleanNotebooksAction@1.1
     - name: Configure NumCosmo
       run: meson setup build -Dbuildtype=release -Dnumcosmo_py=true -Dgtkdoc=disabled --prefix=/usr || (cat build/meson-logs/meson-log.txt && exit 1)
     - name: Building NumCosmo
       run: meson compile -C build
+    - name: Checking indentation
+      run: |
+        uncrustify -c numcosmo_uncrustify.cfg --check -q numcosmo/*.c numcosmo/*.h
+        uncrustify -c numcosmo_uncrustify.cfg --check -q numcosmo/math/*.c numcosmo/math/*.h
+        uncrustify -c numcosmo_uncrustify.cfg --check -q numcosmo/model/*.c numcosmo/model/*.h
+        uncrustify -c numcosmo_uncrustify.cfg --check -q numcosmo/xcor/*.c numcosmo/xcor/*.h
     - name: Test python examples
       run: |
         source build/numcosmo_export.sh
@@ -163,6 +169,9 @@ jobs:
       - name: Running mypy
         run: |
           mypy -p numcosmo_py
+      #- name: Checking indentation
+      #  run: |
+      #    uncrustify -c numcosmo_uncrustify.cfg --check -q numcosmo/*.c numcosmo/*.h
       #- name: Running pylint
       #  run: |
       #    pylint --rcfile .pylintrc numcosmo_py

numcosmo/config_extra.h

@@ -36,18 +36,21 @@
 #ifndef HAVE_SINCOS
 #include <math.h>
 
-static inline void 
+static inline void
 sincos (double x, double *s, double *c)
 {
   s[0] = sin (x);
   c[0] = cos (x);
 }
+
 #endif /* HAVE_SINCOS */
 
 #if HAVE_DECL_LGAMMA_R == 0
-double lgamma_r(double x, int *signp);
+double lgamma_r (double x, int *signp);
+
 #endif /* HAVE_DECL_LGAMMA_R == 0 */
 
 #endif /* NUMCOSMO_GIR_SCAN */
 
 #endif /* _CONFIG_EXTRA_H_ */
+

numcosmo/math/ncm_binsplit.h

@@ -40,7 +40,7 @@ typedef struct _NcmBinSplit NcmBinSplit;
 
 /**
  * NcmBinSplit:
- * 
+ *
  * FIXME
  */
 struct _NcmBinSplit
@@ -73,8 +73,8 @@ void ncm_binsplit_get (NcmBinSplit *bs, mpfr_t res);
 void ncm_binsplit_get_q (NcmBinSplit *bs, mpq_t q);
 gdouble ncm_binsplit_get_d (NcmBinSplit *bs, mp_rnd_t rnd);
 
-#define NCM_BINSPLIT_DECL(name,v,u,n,data) static inline void name (mpz_t v, mpz_t u, gulong n, gpointer data)
-#define NCM_BINSPLIT_DENC_NULL(a,b,c,d) 
+#define NCM_BINSPLIT_DECL(name, v, u, n, data) static inline void name (mpz_t v, mpz_t u, gulong n, gpointer data)
+#define NCM_BINSPLIT_DENC_NULL(a, b, c, d)
 
 G_END_DECLS
 

numcosmo/math/ncm_binsplit_eval.c

@@ -1,19 +1,20 @@
-
 #ifndef NC_BINSPLIT_EVAL_NAME
 #error "To include binsplit_eval.c you must define NC_BINSPLIT_EVAL_NAME"
 #endif
 
-#if !defined(_BINSPLIT_FUNC_P) || !defined(_BINSPLIT_FUNC_Q)
+#if !defined (_BINSPLIT_FUNC_P) || !defined (_BINSPLIT_FUNC_Q)
 #error "To include binsplit_eval.c you must define at least the macros _BINSPLIT_FUNC_(P|Q)"
 #endif
 
 void
 NC_BINSPLIT_EVAL_NAME (NcmBinSplit *bs, gulong n1, gulong n2)
 {
   gulong nd = n2 - n1;
+
   bs->n1 = n1;
   bs->n2 = n2;
-  //printf ("# nd [%lu %lu) %lu %d\n", n1, n2, nd, nd < 5);
+
+  /*printf ("# nd [%lu %lu) %lu %d\n", n1, n2, nd, nd < 5); */
   if (nd < 5)
   {
     _BINSPLIT_FUNC_P (bs->P, NCM_BINSPLIT_ONE, n1, bs->userdata);
@@ -27,94 +28,94 @@ NC_BINSPLIT_EVAL_NAME (NcmBinSplit *bs, gulong n1, gulong n2)
         _BINSPLIT_FUNC_A (bs->T, bs->T, n1, bs->userdata);
         break;
       case 2:
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 1L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp1, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
         _BINSPLIT_FUNC_A (bs->temp1, bs->temp1, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
 
         mpz_set (bs->temp2, bs->P);
-        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1 + 1L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1, bs->userdata);
 
         mpz_add (bs->T, bs->temp1, bs->temp2);
         break;
       case 3:
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 2L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp1, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 2L, bs->userdata);
         _BINSPLIT_FUNC_A (bs->temp1, bs->temp1, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 2L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp2, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->temp2, bs->temp2, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->temp2, bs->temp2, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1 + 1L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1 + 2L, bs->userdata);
 
         mpz_set (bs->temp3, bs->P);
-        _BINSPLIT_FUNC_A (bs->temp3, bs->temp3, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp3, bs->temp3, n1 + 2L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1 + 1L, bs->userdata);
 
         mpz_add (bs->T, bs->temp1, bs->temp2);
         mpz_add (bs->T, bs->T, bs->temp3);
         break;
       case 4:
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->P, bs->P, n1+3L, bs->userdata);        
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1+3L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->B, bs->B, n1+3L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->P, bs->P, n1 + 3L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->Q, bs->Q, n1 + 3L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->B, bs->B, n1 + 3L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp1, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1+3L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp1, bs->temp1, n1 + 3L, bs->userdata);
         _BINSPLIT_FUNC_A (bs->temp1, bs->temp1, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1+3L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp1, bs->temp1, n1 + 3L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp2, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->temp2, bs->temp2, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1+3L, bs->userdata);
-        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1+1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->temp2, bs->temp2, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp2, bs->temp2, n1 + 3L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp2, bs->temp2, n1 + 1L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1+3L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp2, bs->temp2, n1 + 3L, bs->userdata);
 
         _BINSPLIT_FUNC_P (bs->temp3, NCM_BINSPLIT_ONE, n1, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->temp3, bs->temp3, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_P (bs->temp3, bs->temp3, n1+2L, bs->userdata);
-        _BINSPLIT_FUNC_Q (bs->temp3, bs->temp3, n1+3L, bs->userdata);
-        _BINSPLIT_FUNC_A (bs->temp3, bs->temp3, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->temp3, bs->temp3, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_P (bs->temp3, bs->temp3, n1 + 2L, bs->userdata);
+        _BINSPLIT_FUNC_Q (bs->temp3, bs->temp3, n1 + 3L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp3, bs->temp3, n1 + 2L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1+3L, bs->userdata);
-        
+        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp3, bs->temp3, n1 + 3L, bs->userdata);
+
         mpz_set (bs->temp4, bs->P);
-        _BINSPLIT_FUNC_A (bs->temp4, bs->temp4, n1+3L, bs->userdata);
+        _BINSPLIT_FUNC_A (bs->temp4, bs->temp4, n1 + 3L, bs->userdata);
         _BINSPLIT_FUNC_B (bs->temp4, bs->temp4, n1, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp4, bs->temp4, n1+1L, bs->userdata);
-        _BINSPLIT_FUNC_B (bs->temp4, bs->temp4, n1+2L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp4, bs->temp4, n1 + 1L, bs->userdata);
+        _BINSPLIT_FUNC_B (bs->temp4, bs->temp4, n1 + 2L, bs->userdata);
 
         mpz_add (bs->T, bs->temp1, bs->temp2);
         mpz_add (bs->T, bs->T, bs->temp3);
@@ -131,6 +132,7 @@ NC_BINSPLIT_EVAL_NAME (NcmBinSplit *bs, gulong n1, gulong n2)
 
     if (bs->bs[0] == NULL)
       bs->bs[0] = ncm_binsplit_alloc (bs->userdata);
+
     if (bs->bs[1] == NULL)
       bs->bs[1] = ncm_binsplit_alloc (bs->userdata);
 
@@ -146,13 +148,14 @@ NC_BINSPLIT_EVAL_NAME (NcmBinSplit *bs, gulong n1, gulong n2)
     mpz_mul (bs->temp2, bs->bs[0]->T, bs->bs[1]->Q);
 
 #ifdef _HAS_FUNC_B
-    mpz_mul (bs->temp1, bs->temp1, bs->bs[0]->B);    
+    mpz_mul (bs->temp1, bs->temp1, bs->bs[0]->B);
     mpz_mul (bs->temp2, bs->temp2, bs->bs[1]->B);
 #endif
-    
+
     mpz_add (bs->T, bs->temp1, bs->temp2);
   }
-//  mpfr_printf ("# NUC %.15g %Zd/(%Zd %Zd)\n", ncm_binsplit_get_d (bs, GMP_RNDD), bs->T, bs->Q, bs->B);
+
+/*  mpfr_printf ("# NUC %.15g %Zd/(%Zd %Zd)\n", ncm_binsplit_get_d (bs, GMP_RNDD), bs->T, bs->Q, bs->B); */
 }
 
 #undef NC_BINSPLIT_EVAL_NAME
@@ -161,3 +164,4 @@ NC_BINSPLIT_EVAL_NAME (NcmBinSplit *bs, gulong n1, gulong n2)
 #undef _BINSPLIT_FUNC_A
 #undef _BINSPLIT_FUNC_B
 #undef _HAS_FUNC_B
+

numcosmo/math/ncm_bootstrap.h

@@ -1,4 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*-  */
+
 /***************************************************************************
  *            ncm_bootstrap.h
  *
@@ -14,12 +15,12 @@
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * numcosmo is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -65,3 +66,4 @@ gboolean ncm_bootstrap_is_init (NcmBootstrap *bstrap);
 G_END_DECLS
 
 #endif /* _NCM_BOOTSTRAP_H_ */
+

numcosmo/math/ncm_cfg.c

@@ -246,14 +246,14 @@ static gboolean _enable_msg         = TRUE;
 static gboolean _enable_msg_flush   = TRUE;
 static gsl_error_handler_t *gsl_err = NULL;
 
-# if (defined (__GNUC__) \
+# if (defined (__GNUC__)                                            \
   && ((__GNUC__ == 11 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 12))) \
   || (defined (__clang__) && (__clang_major__ >= 12))
 extern void __gcov_dump (void);
 extern void __gcov_reset (void);
 
-#  define __gcov_flush() \
-        do { \
+#  define __gcov_flush()                   \
+        do {                               \
           __gcov_dump (); __gcov_reset (); \
         } while (0)
 # else

numcosmo/math/ncm_cfg.h

@@ -106,9 +106,9 @@ extern guint fftw_default_flags;
 #define NCM_CFG_DATA_DIR_ENV "NUMCOSMO_DATA_DIR"
 
 #ifdef NUMCOSMO_CHECK_PREPARE
-#define NCM_CHECK_PREPARED(obj, name) \
-        G_STMT_START { \
-          if (!obj->prepared) \
+#define NCM_CHECK_PREPARED(obj, name)                                      \
+        G_STMT_START {                                                     \
+          if (!obj->prepared)                                              \
           g_error ("calling method %s on an unprepared instance.", #name); \
         } G_STMT_END
 #else /* NUMCOSMO_CHECK_PREPARE */
@@ -131,14 +131,14 @@ extern guint fftw_default_flags;
 #endif /* mpz_inits */
 
 #ifndef NUMCOSMO_GIR_SCAN
-#define NCM_FITS_ERROR(status) \
-        G_STMT_START { \
-          if (status) \
-          { \
-            gchar errormsg[30]; \
+#define NCM_FITS_ERROR(status)                     \
+        G_STMT_START {                             \
+          if (status)                              \
+          {                                        \
+            gchar errormsg[30];                    \
             fits_get_errstatus (status, errormsg); \
-            g_error ("FITS: %s", errormsg); \
-          } \
+            g_error ("FITS: %s", errormsg);        \
+          }                                        \
         } G_STMT_END
 #endif /* NUMCOSMO_GIR_SCAN */
 

numcosmo/math/ncm_csq1d.c

@@ -88,7 +88,7 @@
 
 typedef enum _NcmCSQ1DEvolStop
 {
-  NCM_CSQ1D_EVOL_STOP_ERROR = -1,
+  NCM_CSQ1D_EVOL_STOP_ERROR    = -1,
   NCM_CSQ1D_EVOL_STOP_FINISHED = 0,
   NCM_CSQ1D_EVOL_STOP_ADIABATIC_START,
   NCM_CSQ1D_EVOL_STOP_UP_START,