From 5c6df05e30b48f0dd17c5669c324828635aadbe1 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 12 Jul 2021 20:03:28 -0400 Subject: [PATCH] Fixed namespace collision between RMVS and SyMBA variable NTENC --- .../swiftest_rmvs_vs_swifter_rmvs.ipynb | 12 ++++++------ src/modules/rmvs_classes.f90 | 12 ++++++------ src/modules/symba.f90 | 8 ++++---- src/modules/symba_classes.f90 | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb index d564f3b97..26f7005f5 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/swiftest_rmvs_vs_swifter_rmvs.ipynb @@ -461,9 +461,9 @@ "array([ 1, 2, 3, 4, 5, 6, 7, 8, 101, 102, 103, 104, 105, 106,\n", " 107, 108, 109, 110, 111, 112, 113, 114, 115, 116])\n", "Coordinates:\n", - " * id (id) int64 1 2 3 4 5 6 7 8 101 ... 109 110 111 112 113 114 115 116" + " * id (id) int64 1 2 3 4 5 6 7 8 101 ... 109 110 111 112 113 114 115 116" ], "text/plain": [ "\n", @@ -846,10 +846,10 @@ " 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.])\n", "Coordinates:\n", " id int64 4\n", - " * time (d) (time (d)) float64 0.0 11.0 22.0 33.0 ... 330.0 341.0 352.0 363.0
    • " ], "text/plain": [ "\n", diff --git a/src/modules/rmvs_classes.f90 b/src/modules/rmvs_classes.f90 index 7b4ecc36d..7ea5ad2c2 100644 --- a/src/modules/rmvs_classes.f90 +++ b/src/modules/rmvs_classes.f90 @@ -8,12 +8,12 @@ module rmvs_classes implicit none public - integer(I4B), parameter :: NTENC = 10 - integer(I4B), parameter :: NTPHENC = 3 - integer(I4B), parameter :: NTPENC = NTENC * NTPHENC - real(DP), parameter :: RHSCALE = 3.5_DP - real(DP), parameter :: RHPSCALE = 1.0_DP - real(DP), parameter :: FACQDT = 2.0_DP + integer(I4B), private, parameter :: NTENC = 10 + integer(I4B), private, parameter :: NTPHENC = 3 + integer(I4B), private, parameter :: NTPENC = NTENC * NTPHENC + real(DP), private, parameter :: RHSCALE = 3.5_DP + real(DP), private, parameter :: RHPSCALE = 1.0_DP + real(DP), private, parameter :: FACQDT = 2.0_DP !******************************************************************************************************************************** ! rmvs_nbody_system class definitions and method interfaces diff --git a/src/modules/symba.f90 b/src/modules/symba.f90 index 209322ee1..41f2de81a 100644 --- a/src/modules/symba.f90 +++ b/src/modules/symba.f90 @@ -8,10 +8,10 @@ module symba use helio implicit none - integer(I4B), public, parameter :: NENMAX = 32767 - integer(I4B), public, parameter :: NTENC = 3 - real(DP), public, parameter :: RHSCALE = 6.5_DP - real(DP), public, parameter :: RSHELL = 0.48075_DP + integer(I4B), private, parameter :: NENMAX = 32767 + integer(I4B), private, parameter :: NTENC = 3 + real(DP), private, parameter :: RHSCALE = 6.5_DP + real(DP), private, parameter :: RSHELL = 0.48075_DP !******************************************************************************************************************************** ! symba_tp class definitions and method interfaces diff --git a/src/modules/symba_classes.f90 b/src/modules/symba_classes.f90 index 26ca7df6e..2dad53567 100644 --- a/src/modules/symba_classes.f90 +++ b/src/modules/symba_classes.f90 @@ -8,10 +8,10 @@ module symba_classes use helio_classes, only : helio_cb, helio_pl, helio_tp, helio_nbody_system implicit none - integer(I4B), parameter :: NENMAX = 32767 - integer(I4B), parameter :: NTENC = 3 - real(DP), parameter :: RHSCALE = 6.5_DP - real(DP), parameter :: RSHELL = 0.48075_DP + !integer(I4B), parameter :: NENMAX = 32767 + !integer(I4B), parameter :: NTENC = 3 + !real(DP), parameter :: RHSCALE = 6.5_DP + !real(DP), parameter :: RSHELL = 0.48075_DP character(*), parameter :: PARTICLE_OUTFILE = 'particle.dat' integer(I4B), parameter :: PARTICLEUNIT = 44 !! File unit number for the binary particle info output file