Merge branch 'master' into github-ci

Author: rtoy

doc/info/Equations.texi

@@ -2474,6 +2474,6 @@ z = -----------]]
    The Method of
    Resultants for Computing Real Solutions of Polynomial Systems, 
    SIAM Journal on Numerical Analysis, Vol 29 No 3, Jun 1992, pp 831-844
-   @url{https:/doi.org/10.1137/0729051, doi:10.1137/0729051}
+   @url{https://doi.org/10.1137/0729051, doi:10.1137/0729051}
 
 @end itemize

doc/info/cartan.texi

@@ -87,12 +87,12 @@ vector on a form. The vector should be given on the left.
 @end deffn
 
 @anchor{ext_diff}
-@deffn {Function} ext_diff(@var{form})
+@deffn {Function} ext_diff (@var{form})
 The exterior derivative operator. It takes one argument, which should be a differential form.
 @end deffn
 
 @anchor{lie_diff}
-@deffn {Function} lie_diff(@var{vector1},[@var{vector2},@var{form}])
+@deffn {Function} lie_diff (@var{vector1},[@var{vector2},@var{form}])
 The Lie derivative operator. The first argument is a vector field. The
 second argument may be either a vector field or a differential form.
 @end deffn

doc/info/colnew.texi.m4

@@ -1616,7 +1616,7 @@ The figure below shows the solution for
 (Ascher 1979a) U. Ascher, J. Christiansen and R. D. Russell,
     A collocation solver for mixed order systems of boundary value problems,
     Math. Comp. 33 (1979), 659-679,
-    @url{https:/doi.org/10.1090/S0025-5718-1979-0521281-7,
+    @url{https://doi.org/10.1090/S0025-5718-1979-0521281-7,
     doi:10.1090/S0025-5718-1979-0521281-7}
 
 @item @anchor{ascher-1979b}
@@ -1631,21 +1631,21 @@ The figure below shows the solution for
 (Ascher 1981a) U. Ascher, J. Christiansen and R. D. Russell,
     Collocation software for boundary-value odes,
     ACM Trans. Math Software 7 (1981), 209-222.
-    @url{https:/doi.org/10.1145/355945.355950,
+    @url{https://doi.org/10.1145/355945.355950,
     doi:10.1145/355945.355950}
 
 @item @anchor{ascher-1981b}
 (Ascher 1981b) U. Ascher, U., J. Christiansen, and R. D. Russell.
    ‘Algorithm 569: COLSYS: Collocation Software for Boundary-Value ODEs [D2]’.
    ACM Transactions on Mathematical Software 7, no. 2 (June 1981): 223–29.
-   @url{https:/doi.org/10.1145/355945.355951,
+   @url{https://doi.org/10.1145/355945.355951,
    doi:10.1145/355945.355951}
 
 @item @anchor{ascher-russell}
 (Ascher&Russell 1981) U. Ascher and R. D. Russell.
    ‘Reformulation of Boundary Value Problems into “Standard” Form’.
    SIAM Review 23, no. 2 (April 1981), 238–54,
-   @url{https:/doi.org/10.1137/1023039, doi:10.1137/1023039}
+   @url{https://doi.org/10.1137/1023039, doi:10.1137/1023039}
 
 @item @anchor{parker-wan}
 (Parker&Wan 1984) David F. Parker and Frederic Y. M. Wan,

interfaces/xmaxima/Tkmaxima/Plotdf.tcl

@@ -4,7 +4,7 @@
 # For distribution under GNU public License.  See COPYING. #
 #                                                          #
 #     Modified by Jaime E. Villate                         #
-#     Time-stamp: "2025-05-27 10:54:55 villate"            #
+#     Time-stamp: "2025-05-29 21:22:36 villate"            #
 ############################################################
 
 global plotdfOptions
@@ -23,6 +23,7 @@ set plotdfOptions {
     {xcenter 0.0 {(xcenter,ycenter) is the origin of the window}}
     {ycenter 0.0 "see xcenter"}
     {bbox "" "xmin ymin xmax ymax .. overrides the -xcenter etc"}
+    {algorithm "adamsMoulton" "can be rungeKutta, rungeKuttaA or adamsMoulton"}
     {tinitial 0.0 "The initial value of variable t"}
     {nsteps 300 "Number of steps to do in one pass"}
     {xfun "" "A semi colon separated list of functions to plot as well"}
@@ -100,22 +101,19 @@ proc doIntegrateScreen { win sx sy  } {
 }
 
 proc doIntegrate { win x0 y0 } {
-    makeLocal $win xradius yradius c dxdt dydt tinitial tstep nsteps \
+    makeLocal $win xradius yradius c dxdt dydt algorithm tinitial tstep nsteps \
         direction linewidth tinitial versus_t xmin xmax ymin ymax parameters \
         width height
     linkLocal $win didLast trajectoryStarts
     set linewidth [expr {$linewidth*[vectorlength $width $height]/1000.}]
     set arrowshape [scalarTimesVector $linewidth {3 5 2}]
 
-    # integrator can be rungeKutta, rungeKuttaA or adamsMoulton
-    set integrator {adamsMoulton}
     oset $win trajectory_at [format "%.10g  %.10g" $x0 $y0]
     lappend trajectoryStarts [list $x0 $y0]
     set didLast {}
     # puts "doing at $trajectory_at"
-    # Default value for tstep equal to the plot box's diagonal divided by 400
     set steps $nsteps
-    set h $tstep
+    set integrator $algorithm
 
     set todo {1}
     switch -- $direction {
@@ -399,6 +397,7 @@ proc plotdf { args } {
     oset $win didLast {}
     # Makes extra vertical space for sliders
     linkLocal $win sliders height tstep xradius yradius
+    # Default value for tstep equal to the plot box's diagonal divided by 400
     if { "$tstep" == "" } {
 	set tstep [expr {[vectorlength $xradius $yradius] / 200.0}]
     }
@@ -473,10 +472,21 @@ proc doConfigdf { win } {
     pack $frdydx.dxdt  $frdydx.dydt -side bottom  -fill x -expand 1
     pack $frdydx.dydxbut $frdydx.dydtbut -side left -fill x -expand 1
 
-    foreach w {narrows parameters xfun linewidth xradius yradius xcenter ycenter tinitial versus_t tstep nsteps direction curves vectors fieldlines } {
+    foreach w {narrows parameters xfun linewidth xradius yradius xcenter \
+        ycenter tinitial versus_t tstep nsteps direction curves vectors \
+        fieldlines} {
 	mkentry $wb1.$w [oloc $win $w] $w $buttonFont
 	pack $wb1.$w -side bottom -expand 1 -fill x
     }
+    radiobutton $wb1.rk -text "4th order Runge Kutta" \
+        -variable [oloc $win algorithm] -value rungeKutta -anchor w
+    radiobutton $wb1.rka -text "Adaptive-step Runge Kutta" \
+        -variable [oloc $win algorithm] -value rungeKuttaA -anchor w
+    radiobutton $wb1.am -text "Adams-Moulton" \
+        -variable [oloc $win algorithm] -value adamsMoulton -anchor w
+    pack $wb1.rk -side bottom -expand 1 -fill x
+    pack $wb1.rka -side bottom -expand 1 -fill x
+    pack $wb1.am -side bottom -expand 1 -fill x
     mkentry $wb1.trajectory_at [oloc $win trajectory_at] \
 	"Trajectory at" $buttonFont
     bind $wb1.trajectory_at.e <KeyPress-Return> \

tests/rtest_elliptic.mac

@@ -1068,7 +1068,7 @@ true$
 closeto(jacobi_am(0.5, 1.5) - 0.47071978970469916313, 4.4409e-16);
 true$
 
-closeto(jacobi_am(1.5, 1.5+%i) - (0.93405421687007830327 - 0.37239604521460716554*%i), 5.4673e-16);
+closeto(jacobi_am(1.5, 1.5+%i) - (0.93405421687007830327 - 0.37239604521460716554*%i), 1.0991e-15);
 true$
 
 closeto(jacobi_am(2.0-.5*%i, .5+.5*%i) - (1.4693733607922556333 - 0.7245711235745948013*%i), 8.9510e-16);
@@ -1119,7 +1119,7 @@ makelist(block([z : 2*k*%i, m : 1.75],
 [true, true, true, true, true, true, true, true, true, true, true];
 
 makelist(block([z : 2*k*%i, m : 1.75+%i],
-    closeto(sin(jacobi_am(z, m))-jacobi_sn(z, m), 4.9651e-16)),
+    closeto(sin(jacobi_am(z, m))-jacobi_sn(z, m), 6.2804e-16)),
   k, 0, 10);
 [true, true, true, true, true, true, true, true, true, true, true];