Fix another FYPP case

cp2k · Feb 17, 2022 · 0f62be6 · 0f62be6
1 parent 0d7d587
commit 0f62be6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.pre-commit/clang-format-fypp.sh b/.pre-commit/clang-format-fypp.sh
@@ -38,7 +38,8 @@ function main()
     esac
 
     for i in ${files}; do
-        ${sed_fcn} -e 's/# : /#:/g' -e 's/} \$/}\$/g' -e '/\${$/ { N; s/\${\n[[:space:]]*/\${/; }' "$i"
+        ${sed_fcn} -e '/\${$/ { N; s/\${\n[[:space:]]*/\${/; }' "$i"
+        ${sed_fcn} -e 's/# : /#:/g' -e 's/} \$/}\$/g' "$i"
     done
 }
 

diff --git a/src/dbcsr.h b/src/dbcsr.h
@@ -214,7 +214,7 @@ void c_dbcsr_iterator_next_block_index(const dbcsr_iterator c_iterator, int *c_r
 
 #:for n_inst, nametype, base, prec, ctype, extype in c_exparams
 
-void c_dbcsr_iterator_next_2d_block_${nametype} $(const dbcsr_iterator c_iterator, int *c_row, int *c_column, ${extype} $ **c_block, bool *c_transposed,
+void c_dbcsr_iterator_next_2d_block_${nametype}$(const dbcsr_iterator c_iterator, int *c_row, int *c_column, ${extype}$ **c_block, bool *c_transposed,
                 int *c_block_number, int *c_row_size, int *c_col_size, int *c_row_offset, int *c_col_offset);
 
 #:endfor

diff --git a/src/tensors/dbcsr_tensor.h b/src/tensors/dbcsr_tensor.h
@@ -76,7 +76,7 @@ void c_dbcsr_t_get_${ndim}$d_block_p_${dsuffix}$(const dbcsr_t_tensor c_tensor,
 void c_dbcsr_t_get_data_${dsuffix}$(const dbcsr_t_tensor c_tensor, ${ctype}$ **c_data, long long int *c_data_size,
                                      ${ctype}$ c_select_data_type, int *c_lb, int *c_ub);
 
-void c_dbcsr_t_contract_${dsuffix} $(const ${ctype} $ c_alpha, dbcsr_t_tensor c_tensor_1, dbcsr_t_tensor c_tensor_2, const ${ctype} $ c_beta,
+void c_dbcsr_t_contract_${dsuffix}$(const ${ctype}$ c_alpha, dbcsr_t_tensor c_tensor_1, dbcsr_t_tensor c_tensor_2, const ${ctype}$ c_beta,
                dbcsr_t_tensor c_tensor_3, const int *c_contract_1, const int c_contract_1_size,
                const int *c_notcontract_1, const int c_notcontract_1_size, const int *c_contract_2,
                const int c_contract_2_size, const int *c_notcontract_2, const int c_notcontract_2_size,
@@ -86,7 +86,7 @@ void c_dbcsr_t_contract_${dsuffix} $(const ${ctype} $ c_alpha, dbcsr_t_tensor c_
                const double *filter_eps, long long int *flop, const bool *move_data, const bool *retain_sparsity,
                const int *unit_nr, const bool *log_verbose);
 
-void c_dbcsr_t_contract_index_${dsuffix} $(const ${ctype} $ c_alpha, dbcsr_t_tensor c_tensor_1, dbcsr_t_tensor c_tensor_2, const ${ctype} $ c_beta,
+void c_dbcsr_t_contract_index_${dsuffix}$(const ${ctype}$ c_alpha, dbcsr_t_tensor c_tensor_1, dbcsr_t_tensor c_tensor_2, const ${ctype}$ c_beta,
                dbcsr_t_tensor c_tensor_3, const int *c_contract_1, const int contract_1_size,
                const int *c_notcontract_1, const int notcontract_1_size, const int *c_contract_2,
                const int contract_2_size, const int *c_notcontract_2, const int notcontract_2_size, const int *c_map_1,