Skip to content

Commit e8054de

Browse files
authored
Merge branch 'main' into fix-remove_deprecated
2 parents e5a7214 + 1296cfb commit e8054de

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/tests_cmake_t8code_api.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ jobs:
8585
run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON"
8686
&& echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV
8787
- name: build config variables
88-
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
88+
run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DCMAKE_C_FLAGS_DEBUG=${DEBUG_CONFIG} -DCMAKE_CXX_FLAGS_DEBUG=${DEBUG_CONFIG} -DT8CODE_BUILD_FORTRAN_INTERFACE=ON -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake"
8989
&& echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV
9090
# cmake and test with fortran
9191
- name: check fortran
9292
run: echo "Checking fortran"
9393
- name: echo cmake line
94-
run: echo cmake ../ $CONFIG_OPTIONS -DT8CODE_BUILD_FORTRAN_INTERFACE=ON
94+
run: echo cmake ../ $CONFIG_OPTIONS
9595
- name: cmake MPI fortran debug
96-
run: mkdir build_fortran && cd build_fortran && cmake ../ $CONFIG_OPTIONS -DT8CODE_ENABLE_FORTRAN=ON
96+
run: mkdir build_fortran && cd build_fortran && cmake ../ $CONFIG_OPTIONS
9797
- name: OnFailUploadLog
9898
if: failure()
9999
uses: actions/upload-artifact@v4

api/t8_fortran_interface/t8_fortran_interface.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ t8_fortran_adapt_by_coordinates_callback (t8_forest_t forest, t8_forest_t forest
139139
/* Coarsen if a family was given and return value is negative. */
140140
if (is_family) {
141141
/* The elements form a family */
142-
T8_ASSERT (t8_elements_are_family (scheme, elements));
142+
T8_ASSERT (t8_elements_are_family (scheme, tree_class, elements));
143143
/* Build the parent. */
144144
t8_element_t *parent;
145-
t8_element_new (scheme, 1, &parent);
146-
t8_element_parent (scheme, elements[0], parent);
145+
t8_element_new (scheme, tree_class, 1, &parent);
146+
t8_element_get_parent (scheme, tree_class, elements[0], parent);
147147
/* Get the coordinates of the parent. */
148148
t8_forest_element_centroid (forest_from, which_tree, parent, midpoint);
149149

example/advect/t8_advection.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ t8_advect_problem_partition (t8_advect_problem_t *problem, int measure_time)
821821
sc_stats_accumulate (&problem->stats[ADVECT_AMR], partition_time);
822822
problem->stats[ADVECT_PARTITION_DATA].count = 1;
823823
problem->stats[ADVECT_AMR].count = 1;
824-
t8_debugf ("statis ghost: %f\n\n", ghost_time);
824+
t8_debugf ("status ghost: %f\n\n", ghost_time);
825825
}
826826

827827
/* destroy the old forest and the element data */

test/t8_cmesh_generator/t8_gtest_cmesh_cartestian_product.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ vector_to_iter_pair (const std::vector<Args>& vec)
127127
}
128128

129129
/**
130-
* A helper function to recursively create the next tuple of parameters in a cartesion product way
130+
* A helper function to recursively create the next tuple of parameters in a cartesian product way
131131
*
132132
* @tparam Args
133133
* @tparam B
@@ -148,7 +148,7 @@ increment (const B& begins, std::pair<Args, Args>& r)
148148
}
149149

150150
/**
151-
* A helper function to recursively create the next tuple of parameters in a cartesion product way
151+
* A helper function to recursively create the next tuple of parameters in a cartesian product way
152152
*
153153
* @tparam T
154154
* @tparam TT

test/t8_forest/t8_gtest_partition_data.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ gTestCompareEQ (const T& value1, const T& value2) -> std::enable_if_t<std::is_sa
130130
* \brief This function generates example data of the type \tparam T corresponding to the global
131131
* element id of each element. It constructs one value per element. The data is defined according
132132
* to the partition of \a initial_forest. Afterwards a call to \see t8_forest_partition_data() is made
133-
* which redistributes the example data array accordindly to the partition of \a partitioned_forest.
133+
* which redistributes the example data array accordingly to the partition of \a partitioned_forest.
134134
* Once the partitioning of the example data array is finished, we check whether each process obtained
135135
* the correct data entries in the proper ordering.
136136
*

test/t8_gtest_vec.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <t8_vec.h>
2727
#include <test/t8_gtest_custom_assertion.hxx>
2828

29-
/* Wrapper for 3D vector dataype */
29+
/* Wrapper for 3D vector datatype */
3030
typedef double t8_test_vec[3];
3131
/* Accuracy used for comparisons with correct result */
3232
#define epsilon 1e-9

0 commit comments

Comments
 (0)