Set all angles in EL mode to be in degrees

MintonGroup · Aug 20, 2021 · f9e1ebe · f9e1ebe
1 parent ebd3776
commit f9e1ebe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/io/io.f90 b/src/io/io.f90
@@ -1101,6 +1101,13 @@ module function io_read_frame_body(self, iu, param) result(ierr)
 
             end do
          end select
+
+         if (param%in_form == EL) then
+            self%inc(1:n)   = self%inc(1:n) * DEG2RAD
+            self%capom(1:n) = self%capom(1:n) * DEG2RAD
+            self%omega(1:n) = self%omega(1:n) * DEG2RAD
+            self%capm(1:n)  = self%capm(1:n) * DEG2RAD
+         end if
       end associate
 
       ierr = 0
@@ -1482,10 +1489,10 @@ module subroutine io_write_frame_body(self, iu, param)
          case (EL) 
             write(iu, err = 667, iomsg = errmsg) self%a(1:n)
             write(iu, err = 667, iomsg = errmsg) self%e(1:n)
-            write(iu, err = 667, iomsg = errmsg) self%inc(1:n)
-            write(iu, err = 667, iomsg = errmsg) self%capom(1:n)
-            write(iu, err = 667, iomsg = errmsg) self%omega(1:n)
-            write(iu, err = 667, iomsg = errmsg) self%capm(1:n)
+            write(iu, err = 667, iomsg = errmsg) self%inc(1:n) * RAD2DEG
+            write(iu, err = 667, iomsg = errmsg) self%capom(1:n) * RAD2DEG
+            write(iu, err = 667, iomsg = errmsg) self%omega(1:n) * RAD2DEG
+            write(iu, err = 667, iomsg = errmsg) self%capm(1:n) * RAD2DEG
          case (XV)
             write(iu, err = 667, iomsg = errmsg) self%xh(1, 1:n)
             write(iu, err = 667, iomsg = errmsg) self%xh(2, 1:n)

diff --git a/src/modules/swiftest_globals.f90 b/src/modules/swiftest_globals.f90
@@ -22,7 +22,8 @@ module swiftest_globals
    real(DP), parameter :: PI3BY2 = 4.712388980384689857693965074919254326296_DP !! Definition of /(3 \pi / 2\)
    real(DP), parameter :: TWOPI  = 6.283185307179586476925286766559005768394_DP !! Definition of 2 \pi
    real(DP), parameter :: THIRD  = 0.333333333333333333333333333333333333333_DP !! Definition of 1 / 3
-   real(DP), parameter :: DEGRAD = 180.0_DP/PI !! Definition of conversion factor from degrees to radians
+   real(DP), parameter :: DEG2RAD = PI / 180.0_DP !! Definition of conversion factor from degrees to radians
+   real(DP), parameter :: RAD2DEG = 180.0_DP / PI !! Definition of conversion factor from degrees to radians
 
    integer(I4B), parameter :: LOWERCASE_BEGIN  = iachar('a') !! ASCII character set parameter for lower to upper conversion - start of lowercase
    integer(I4B), parameter :: LOWERCASE_END    = iachar('z') !! ASCII character set parameter for lower to upper conversion - end of lowercase