Skip to content

Commit ab8f3a9

Browse files
fix the mismatch merge
1 parent 5638972 commit ab8f3a9

13 files changed

Lines changed: 45 additions & 1224 deletions

File tree

.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11

22
build/*
33

4-
# Python cache files
5-
__pycache__/
6-
*.py[cod]
7-
*$py.class
8-
94
Makefile
105
*.lo
116
*.a
@@ -30,4 +25,3 @@ src/exp
3025
src/user/CylindricalDisk.cc
3126
src/user/EllipsoidForce.cc
3227
src/user/SLSphere.cc
33-
_codeql_detected_source_root

expui/BiorthBasis.H

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,12 +1024,8 @@ namespace BasisClasses
10241024
};
10251025

10261026
/**
1027-
@brief Uses EmpCylSL basis to evaluate expansion coeffients and provide
1027+
Uses EmpCylSL basis to evaluate expansion coeffients and provide
10281028
potential and density basis fields
1029-
1030-
@note The HDF5 disk basis cache is gzip compressed by default to
1031-
save disk space. The user may turn off compression using the
1032-
`compress: 0` parameter, although we have no particular use case.
10331029
*/
10341030
class Cylindrical : public BiorthBasis
10351031
{

0 commit comments

Comments
 (0)