Merge pull request #52 from ORNL-Fusion/master_dev

Master dev
ORNL-Fusion · Sep 17, 2024 · 4b6f80b · 4b6f80b
2 parents 6fd08d1 + 222139b
commit 4b6f80b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Sources/evolution.f90 b/Sources/evolution.f90
@@ -18,7 +18,7 @@ MODULE evolution
       USE island_params, mpol=>mpol_i, ntor=>ntor_i, ns=>ns_i,                 &
           nfp=>nfp_i, mnmax=>mnmax_i, hs=>hs_i
       USE timer_mod
-      USE siesta_namelist, ONLY: eta_factor
+      USE siesta_namelist, ONLY: eta_factor, l_force_restart
       USE descriptor_mod, ONLY: iam, nprocs
       USE nscalingtools, ONLY: SKSDBG, PARSOLVER, PARFUNCTISL, MPI_ERR,        &
                                startglobrow, endglobrow, rcounts, disp
@@ -690,7 +690,8 @@ SUBROUTINE evolve
       END IF
 
       CALL second0(skston)
-      IF (fsq_total1 .LT. fsq_min .and. iam .eq. 0) THEN
+      IF ((fsq_total1 .LT. fsq_min .or. l_force_restart) .and.                 &
+          iam .eq. 0) THEN
          fsq_min = fsq_total1
          CALL restart_write(restart_ext, wout_file)
       END IF

diff --git a/Sources/siesta_namelist.f90 b/Sources/siesta_namelist.f90
@@ -33,6 +33,10 @@
 !>     @item{lrecon,           Add additional output to the restart file when
 !>                             used in a reconstruction context.
 !>                             DEPRICATED,                                       shared_data::lrecon}
+!>     @item{l_lambda,         Recompute the VMEC lambda on a SIESTA grid. Fixed
+!>                             boundary only.,                                   siesta_namelist::l_lambda}
+!>     @item{l_force_restart,  Force writing of the restart file on each
+!>                             iteration.,                                       siesta_namelist::l_force_restart}
 !>  @end_table
 !>
 !>  @table_section{siesta_algrothim_sec, Algrothim Control Variables}
@@ -145,6 +149,8 @@ MODULE siesta_namelist
       LOGICAL :: l_vessel = .FALSE.
 !>  Recompute lambda on the SIESTA grid.
       LOGICAL :: l_lambda = .TRUE.
+!>  Recompute lambda on the SIESTA grid.
+      LOGICAL :: l_force_restart = .FALSE.
 
 !  Algrothim Control Variables}
 !>  Maximum number of iterations after diagonal prec.
@@ -210,7 +216,7 @@ MODULE siesta_namelist
 !  Control flags
         ladd_pert, lresistive, lrestart, l_tracing, lcolscale,                 &
         l_silo_output, l_silo_output, l_silo3D, l_output_alliter,              &
-        l_VMEC_Uniform, lasym, lrecon, l_vessel, l_lambda,                     &
+        l_VMEC_Uniform, lasym, lrecon, l_vessel, l_lambda, l_force_restart,    &
 !  Algrothim Control Variables
         niter, ftol, mupar, levmarq_param, eta_factor, nprecon,                &
         ngmres_type, iortho,                                                   &