fixed bugs with bodies (#28)

* fixed bugs with bodies * adding missing files for test * Update .cirrus.yml for new brew behavior --------- Co-authored-by: Joshua Anibal <[email protected]>
joanibal · Mar 5, 2024 · a0cb243 · a0cb243
1 parent 7b190bd
commit a0cb243
Show file tree

Hide file tree

Showing 8 changed files with 414 additions and 9 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -43,7 +43,7 @@ cirrus_wheels_macos_arm64_task:
 
   install_pre_requirements_script:
     - brew install [email protected]
-    - ln -s python3 /opt/homebrew/opt/[email protected]/bin/python
+    - ln -s python3.10 /opt/homebrew/opt/[email protected]/bin/python
 
   build_script:
     - which python

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'pyavl',
   'c',
-  version: '1.6.0',
+  version: '1.6.1',
   license: 'GPL-2.0',
   meson_version: '>= 0.64.0',
   default_options: [

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ dependencies = [
     "numpy>=1.19",
 ]
 readme = "README.md"
-version = "1.6.0" # this automatically updates __init__.py
+version = "1.6.1" # this automatically updates __init__.py
 
 
 [tool.cibuildwheel]

diff --git a/src/ainput.f b/src/ainput.f
@@ -191,7 +191,7 @@ SUBROUTINE INPUT(LUN,FNAME,FERR)
 C
         IF(IBODY.NE.0) THEN
 C------- "old" body is still active, so build it before finishing
-         CALL MAKEBODY(IBODY, IBX,
+         CALL MAKEBODY(IBODY,
      &       NVB, BSPACE,
      &       XBOD,YBOD,TBOD,NBOD)
 C
@@ -223,7 +223,7 @@ SUBROUTINE INPUT(LUN,FNAME,FERR)
 C
         IF(IBODY.NE.0) THEN
 C------- "old" body is still active, so build it before finishing
-         CALL MAKEBODY(IBODY, IBX,
+         CALL MAKEBODY(IBODY,
      &       NVB, BSPACE,
      &       XBOD,YBOD,TBOD,NBOD)
 C
@@ -309,7 +309,7 @@ SUBROUTINE INPUT(LUN,FNAME,FERR)
 C
         IF(IBODY.NE.0) THEN
 C------- "old" body is still active, so build it before finishing
-         CALL MAKEBODY(IBODY, IBX,
+         CALL MAKEBODY(IBODY,
      &       NVB, BSPACE,
      &       XBOD,YBOD,TBOD,NBOD)
 C
@@ -341,8 +341,10 @@ SUBROUTINE INPUT(LUN,FNAME,FERR)
 C
         CALL RDLINE(LUN,LINE,NLINE,ILINE)
         BTITLE(IBODY) = LINE(1:NLINE)
-C         WRITE(*,*)
-C         WRITE(*,*) '  Building body: ', BTITLE(IBODY)
+        if (lverbose)then
+           WRITE(*,*)
+           WRITE(*,*) '  Building body: ', BTITLE(IBODY)
+        endif
 C
         CALL RDLINE(LUN,LINE,NLINE,ILINE)
         READ(LINE,*,ERR=990) NVB, BSPACE

diff --git a/src/amake.f b/src/amake.f
@@ -677,7 +677,8 @@ SUBROUTINE MAKEBODY(IBODY,
         RL(3,NLNODE) = XYZTRAN_B(3,IBODY) + XYZSCAL_B(3,IBODY)*YVB
 C
         CALL AKIMA(XBOD,TBOD,NBOD,XVB,TVB,DRDX)
-        RADL(NLNODE) = SQRT(XYZSCAL_B(2,IBODY)*XYZSCAL_B(3,IBODY)) * 0.5*TVB
+        RADL(NLNODE) = SQRT(XYZSCAL_B(2,IBODY)*XYZSCAL_B(3,IBODY)) 
+     & * 0.5*TVB
       ENDDO
 C---- get surface length, area and volume
       VOLB = 0.0

diff --git a/tests/fuseSupra.dat b/tests/fuseSupra.dat
@@ -0,0 +1,151 @@
+_F3J Fuse                       
+    51.000000    0.25000
+    13.000000    0.425000
+    12.501041    0.434002
+    11.990128    0.443781
+    11.478845    0.454163
+    10.967545    0.465166
+    10.456449    0.476816
+     9.945508    0.489164
+     9.434667    0.502230
+     8.924276    0.516016
+     8.414670    0.530521
+     7.905219    0.545773
+     7.393825    0.561850
+     6.881531    0.578732
+     6.370838    0.596348
+     5.862354    0.614687
+     5.355287    0.633804
+     4.851635    0.653665
+     4.352912    0.674271
+     3.858706    0.695758
+     3.368415    0.718316
+     2.881808    0.742113
+     2.398904    0.767263
+     1.919983    0.793793
+     1.444396    0.821570
+     0.970269    0.850538
+     0.494324    0.880483
+     0.013164    0.910930
+    -0.468628    0.940743
+    -0.935865    0.968177
+    -1.396374    0.993016
+    -1.860864    1.015271
+    -2.330851    1.034715
+    -2.805569    1.051226
+    -3.284462    1.064855
+    -3.767800    1.075773
+    -4.255929    1.084174
+    -4.748588    1.090193
+    -5.244974    1.093912
+    -5.744011    1.095392
+    -6.244473    1.094675
+    -6.745889    1.091778
+    -7.247806    1.086690
+    -7.749820    1.079381
+    -8.251549    1.069816
+    -8.752742    1.057956
+    -9.253112    1.043752
+    -9.752414    1.027130
+   -10.250331    1.008005
+   -10.746588    0.986211
+   -11.240778    0.961574
+   -11.732254    0.933896
+   -12.220179    0.902944
+   -12.703416    0.868430
+   -13.180237    0.830006
+   -13.647286    0.787385
+   -14.098492    0.740514
+   -14.522828    0.690019
+   -14.903724    0.637788
+   -15.225227    0.586807
+   -15.482801    0.539601
+   -15.684700    0.497024
+   -15.843814    0.458580
+   -15.970662    0.423582
+   -16.074086    0.390942
+   -16.160914    0.359408
+   -16.234984    0.328024
+   -16.298600    0.295593
+   -16.353098    0.260978
+   -16.398832    0.223523
+   -16.436125    0.183130
+   -16.464678    0.139332
+   -16.484758    0.093422
+   -16.496397    0.046702
+   -16.500000    0.000000
+   -16.496397   -0.046702
+   -16.484758   -0.093422
+   -16.464678   -0.139332
+   -16.436125   -0.183130
+   -16.398832   -0.223523
+   -16.353098   -0.260978
+   -16.298600   -0.295593
+   -16.234984   -0.328024
+   -16.160914   -0.359408
+   -16.074086   -0.390942
+   -15.970662   -0.423582
+   -15.843814   -0.458580
+   -15.684700   -0.497024
+   -15.482801   -0.539601
+   -15.225227   -0.586807
+   -14.903724   -0.637788
+   -14.522828   -0.690019
+   -14.098492   -0.740514
+   -13.647286   -0.787385
+   -13.180237   -0.830006
+   -12.703416   -0.868430
+   -12.220179   -0.902944
+   -11.732254   -0.933896
+   -11.240778   -0.961574
+   -10.746588   -0.986211
+   -10.250331   -1.008005
+    -9.752414   -1.027130
+    -9.253112   -1.043752
+    -8.752742   -1.057956
+    -8.251549   -1.069816
+    -7.749820   -1.079381
+    -7.247806   -1.086690
+    -6.745889   -1.091778
+    -6.244473   -1.094675
+    -5.744011   -1.095392
+    -5.244974   -1.093912
+    -4.748588   -1.090193
+    -4.255929   -1.084174
+    -3.767800   -1.075773
+    -3.284462   -1.064855
+    -2.805569   -1.051226
+    -2.330851   -1.034715
+    -1.860864   -1.015271
+    -1.396374   -0.993016
+    -0.935865   -0.968177
+    -0.468628   -0.940743
+     0.013164   -0.910930
+     0.494324   -0.880483
+     0.970269   -0.850538
+     1.444396   -0.821570
+     1.919983   -0.793793
+     2.398904   -0.767263
+     2.881808   -0.742113
+     3.368415   -0.718316
+     3.858706   -0.695758
+     4.352912   -0.674271
+     4.851635   -0.653665
+     5.355287   -0.633804
+     5.862354   -0.614687
+     6.370838   -0.596348
+     6.881531   -0.578732
+     7.393825   -0.561850
+     7.905219   -0.545773
+     8.414670   -0.530521
+     8.924276   -0.516016
+     9.434667   -0.502230
+     9.945508   -0.489164
+    10.456449   -0.476816
+    10.967545   -0.465166
+    11.478845   -0.454163
+    11.990128   -0.443781
+    12.501041   -0.434002
+    13.000000   -0.425000
+    13.000000   -0.425000
+    51.000000   -0.25000