From 102d1fcdbc5e6344a3ad47e0abedfd2ebbc683e9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:05:59 +0000 Subject: [PATCH 1/7] Initial plan From 62bde43f84da5693c4df73dbd5ac401b5e8f5dfd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:11:19 +0000 Subject: [PATCH 2/7] Rename ExpSphere to ExpDeproj for consistency Co-authored-by: The9Cat <25960766+The9Cat@users.noreply.github.com> --- expui/BiorthBasis.cc | 10 +++++----- exputil/EmpCylSL.cc | 8 ++++---- include/EmpCylSL.H | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/expui/BiorthBasis.cc b/expui/BiorthBasis.cc index b3e07b243..0311ef12e 100644 --- a/expui/BiorthBasis.cc +++ b/expui/BiorthBasis.cc @@ -1417,7 +1417,7 @@ namespace BasisClasses EVEN_M = false; cmapR = 1; cmapZ = 1; - mtype = "ExpSphere"; + mtype = "ExpDeproj"; dtype = "exponential"; vflag = 0; @@ -1578,11 +1578,11 @@ namespace BasisClasses // generate the EOF basis. If "deproject" is set, this will be // overriden in EmpCylSL. // - EmpCylSL::mtype = EmpCylSL::ExpSphere; // Default + EmpCylSL::mtype = EmpCylSL::ExpDeproj; // Default if (mtype.compare("exponential")==0) EmpCylSL::mtype = EmpCylSL::Exponential; - else if (mtype.compare("expsphere")==0) - EmpCylSL::mtype = EmpCylSL::ExpSphere; + else if (mtype.compare("expdeproj")==0) + EmpCylSL::mtype = EmpCylSL::ExpDeproj; else if (mtype.compare("gaussian")==0) EmpCylSL::mtype = EmpCylSL::Gaussian; else if (mtype.compare("plummer")==0) @@ -1593,7 +1593,7 @@ namespace BasisClasses } else { if (myid==0) std::cout << "No EmpCylSL EmpModel named <" << mtype << ">, valid types are: " - << "Exponential, ExpSphere, Gaussian, Plummer, Power " + << "Exponential, ExpDeproj, Gaussian, Plummer, Power " << "(not case sensitive)" << std::endl; throw std::runtime_error("Cylindrical:initialize: EmpCylSL bad parameter"); } diff --git a/exputil/EmpCylSL.cc b/exputil/EmpCylSL.cc index f474ce3cc..9ab5b924b 100644 --- a/exputil/EmpCylSL.cc +++ b/exputil/EmpCylSL.cc @@ -69,11 +69,11 @@ double EmpCylSL::PPOW = 4.0; bool EmpCylSL::NewCoefs = true; -EmpCylSL::EmpModel EmpCylSL::mtype = ExpSphere; +EmpCylSL::EmpModel EmpCylSL::mtype = ExpDeproj; std::map EmpCylSL::EmpModelLabs = { {Exponential, "Exponential"}, - {ExpSphere, "ExpSphere" }, + {ExpDeproj, "ExpDeproj" }, {Gaussian, "Gaussian" }, {Plummer, "Plummer" }, {Power, "Power" }, @@ -553,7 +553,7 @@ double EmpCylSL::massR(double R) case Exponential: ans = 1.0 - (1.0 + R)*exp(-R); break; - case ExpSphere: + case ExpDeproj: ans = expdeproj.mass(R); break; case Gaussian: @@ -593,7 +593,7 @@ double EmpCylSL::densR(double R) case Exponential: ans = exp(-R)/(4.0*M_PI*R); break; - case ExpSphere: + case ExpDeproj: ans = expdeproj.density(R); break; case Gaussian: diff --git a/include/EmpCylSL.H b/include/EmpCylSL.H index f6f4d268f..e1693350f 100644 --- a/include/EmpCylSL.H +++ b/include/EmpCylSL.H @@ -368,7 +368,7 @@ public: //! Type of density model to use enum EmpModel { Exponential, - ExpSphere, + ExpDeproj, Gaussian, Plummer, Power, From 2f096717901b94706827c1001e5faf9e75bbe946 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:11:48 +0000 Subject: [PATCH 3/7] Complete naming alignment to ExpDeproj Co-authored-by: The9Cat <25960766+The9Cat@users.noreply.github.com> --- _codeql_detected_source_root | 1 + 1 file changed, 1 insertion(+) create mode 120000 _codeql_detected_source_root diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/_codeql_detected_source_root @@ -0,0 +1 @@ +. \ No newline at end of file From 8d2a6e9054d289734df3cb16e28bd0b7c60b8287 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:12:01 +0000 Subject: [PATCH 4/7] Remove CodeQL artifact --- _codeql_detected_source_root | 1 - 1 file changed, 1 deletion(-) delete mode 120000 _codeql_detected_source_root diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root deleted file mode 120000 index 945c9b46d..000000000 --- a/_codeql_detected_source_root +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file From 7f723ba24138330becde21fff7cec27c94c9283f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:26:10 +0000 Subject: [PATCH 5/7] Revert naming changes - ExpSphere is correct, not ExpDeproj Co-authored-by: The9Cat <25960766+The9Cat@users.noreply.github.com> --- expui/BiorthBasis.cc | 10 +++++----- exputil/EmpCylSL.cc | 8 ++++---- include/EmpCylSL.H | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/expui/BiorthBasis.cc b/expui/BiorthBasis.cc index 0311ef12e..b3e07b243 100644 --- a/expui/BiorthBasis.cc +++ b/expui/BiorthBasis.cc @@ -1417,7 +1417,7 @@ namespace BasisClasses EVEN_M = false; cmapR = 1; cmapZ = 1; - mtype = "ExpDeproj"; + mtype = "ExpSphere"; dtype = "exponential"; vflag = 0; @@ -1578,11 +1578,11 @@ namespace BasisClasses // generate the EOF basis. If "deproject" is set, this will be // overriden in EmpCylSL. // - EmpCylSL::mtype = EmpCylSL::ExpDeproj; // Default + EmpCylSL::mtype = EmpCylSL::ExpSphere; // Default if (mtype.compare("exponential")==0) EmpCylSL::mtype = EmpCylSL::Exponential; - else if (mtype.compare("expdeproj")==0) - EmpCylSL::mtype = EmpCylSL::ExpDeproj; + else if (mtype.compare("expsphere")==0) + EmpCylSL::mtype = EmpCylSL::ExpSphere; else if (mtype.compare("gaussian")==0) EmpCylSL::mtype = EmpCylSL::Gaussian; else if (mtype.compare("plummer")==0) @@ -1593,7 +1593,7 @@ namespace BasisClasses } else { if (myid==0) std::cout << "No EmpCylSL EmpModel named <" << mtype << ">, valid types are: " - << "Exponential, ExpDeproj, Gaussian, Plummer, Power " + << "Exponential, ExpSphere, Gaussian, Plummer, Power " << "(not case sensitive)" << std::endl; throw std::runtime_error("Cylindrical:initialize: EmpCylSL bad parameter"); } diff --git a/exputil/EmpCylSL.cc b/exputil/EmpCylSL.cc index 9ab5b924b..f474ce3cc 100644 --- a/exputil/EmpCylSL.cc +++ b/exputil/EmpCylSL.cc @@ -69,11 +69,11 @@ double EmpCylSL::PPOW = 4.0; bool EmpCylSL::NewCoefs = true; -EmpCylSL::EmpModel EmpCylSL::mtype = ExpDeproj; +EmpCylSL::EmpModel EmpCylSL::mtype = ExpSphere; std::map EmpCylSL::EmpModelLabs = { {Exponential, "Exponential"}, - {ExpDeproj, "ExpDeproj" }, + {ExpSphere, "ExpSphere" }, {Gaussian, "Gaussian" }, {Plummer, "Plummer" }, {Power, "Power" }, @@ -553,7 +553,7 @@ double EmpCylSL::massR(double R) case Exponential: ans = 1.0 - (1.0 + R)*exp(-R); break; - case ExpDeproj: + case ExpSphere: ans = expdeproj.mass(R); break; case Gaussian: @@ -593,7 +593,7 @@ double EmpCylSL::densR(double R) case Exponential: ans = exp(-R)/(4.0*M_PI*R); break; - case ExpDeproj: + case ExpSphere: ans = expdeproj.density(R); break; case Gaussian: diff --git a/include/EmpCylSL.H b/include/EmpCylSL.H index e1693350f..f6f4d268f 100644 --- a/include/EmpCylSL.H +++ b/include/EmpCylSL.H @@ -368,7 +368,7 @@ public: //! Type of density model to use enum EmpModel { Exponential, - ExpDeproj, + ExpSphere, Gaussian, Plummer, Power, From 8603c9879cf05af944c0e20dc2c9b73b85122dd9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:26:57 +0000 Subject: [PATCH 6/7] Complete revert to ExpSphere naming Co-authored-by: The9Cat <25960766+The9Cat@users.noreply.github.com> --- _codeql_detected_source_root | 1 + 1 file changed, 1 insertion(+) create mode 120000 _codeql_detected_source_root diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root new file mode 120000 index 000000000..945c9b46d --- /dev/null +++ b/_codeql_detected_source_root @@ -0,0 +1 @@ +. \ No newline at end of file From 1e38d8beaa346f6000419411a0c56f30893de838 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:27:06 +0000 Subject: [PATCH 7/7] Remove CodeQL artifact --- _codeql_detected_source_root | 1 - 1 file changed, 1 deletion(-) delete mode 120000 _codeql_detected_source_root diff --git a/_codeql_detected_source_root b/_codeql_detected_source_root deleted file mode 120000 index 945c9b46d..000000000 --- a/_codeql_detected_source_root +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file