Cleaned up/improved spinup steady-state thermal calculation option; Updated...

Cleaned up/improved spinup steady-state thermal calculation option; Updated strain softening module to avoid name conflict; Added option to fix all surfaces in spinup phase; Added option to fix cloud during spinup phase; Added option for spinup convergence tolerance; Added option for using spinup phase material numbers

src/read_input_file.f90

@@ -359,6 +359,31 @@ if (iproc==0) call scanfile (params%infile,'ztemp',params%ztemp,ires)
 params%ztemp=params%ztemp/params%vex
 call mpi_bcast(params%ztemp,1,mpi_double_precision,0,mpi_comm_world,ierr)
 
+params%sstemp_spinup=.false.
+if (iproc==0) then
+   call scanfile (params%infile,'sstemp_spinup',answer,ires)
+   params%sstemp_spinup=(trim(answer)=='T')
+end if
+call mpi_bcast(params%sstemp_spinup,1,mpi_logical,0,mpi_comm_world,ierr)
+
+params%sstemp_viscosity_spinup=1.d0
+if (iproc==0) call scanfile (params%infile,'sstemp_viscosity_spinup',params%sstemp_viscosity_spinup,ires)
+call mpi_bcast(params%sstemp_viscosity_spinup,1,mpi_double_precision,0,mpi_comm_world,ierr)
+
+params%all_surf_fixed_spinup=.false.
+if (iproc==0) then
+   call scanfile (params%infile,'all_surf_fixed_spinup',answer,ires)
+   params%all_surf_fixed_spinup=(trim(answer)=='T')
+end if
+call mpi_bcast(params%all_surf_fixed_spinup,1,mpi_logical,0,mpi_comm_world,ierr)
+
+params%fixed_cloud_spinup=.false.
+if (iproc==0) then
+   call scanfile (params%infile,'fixed_cloud_spinup',answer,ires)
+   params%fixed_cloud_spinup=(trim(answer)=='T')
+end if
+call mpi_bcast(params%fixed_cloud_spinup,1,mpi_logical,0,mpi_comm_world,ierr)
+
 params%smoothing_type=0
 if (iproc==0) call scanfile (params%infile,'smoothing_type',params%smoothing_type,ires)
 call mpi_bcast(params%smoothing_type,1,mpi_integer,0,mpi_comm_world,ierr)
@@ -599,7 +624,7 @@ call mpi_bcast(params%penalty,1,mpi_double_precision,0,mpi_comm_world,ierr)
 params%tempscale=1.d0
 if (iproc==0) call scanfile (params%infile,'tempscale',params%tempscale,ires)
 call mpi_bcast(params%tempscale,1,mpi_double_precision,0,mpi_comm_world,ierr)
-      
+
 params%refine_ratio=1.d0                                                          
 if (iproc==0) call scanfile (params%infile,'refine_ratio',params%refine_ratio,ires)              
 call mpi_bcast(params%refine_ratio,1,mpi_double_precision,0,mpi_comm_world,ierr)
@@ -842,8 +867,15 @@ call mpi_bcast(params%griditer_spinup,1,mpi_integer,0,mpi_comm_world,ierr)
 params%griditer=params%griditer_main
 call mpi_bcast(params%griditer,1,mpi_integer,0,mpi_comm_world,ierr)
 
-params%tol=1.d-3
-if (iproc==0) call scanfile (params%infile,'tol',params%tol,ires)
+params%tol_main=1.d-3
+if (iproc==0) call scanfile (params%infile,'tol',params%tol_main,ires)
+call mpi_bcast(params%tol_main,1,mpi_double_precision,0,mpi_comm_world,ierr)
+
+params%tol_spinup=params%tol_main
+if (iproc==0) call scanfile (params%infile,'tol_spinup',params%tol_spinup,ires)
+call mpi_bcast(params%tol,1,mpi_double_precision,0,mpi_comm_world,ierr)
+
+params%tol=params%tol_main
 call mpi_bcast(params%tol,1,mpi_double_precision,0,mpi_comm_world,ierr)
 
 params%niter_move=10
@@ -1204,9 +1236,14 @@ if (params%debug.gt.0 .and. iproc.eq.0) then
   write(*,'(a,e11.4)') shift//'dt_spinup ',params%dt_spinup
   write(*,'(a,i4)')    shift//'griditer_spinup ',params%griditer_spinup
   write(*,'(a,i4)')    shift//'nonlinear_iterations_spinup ',params%nonlinear_iterations_spinup
+  write(*,'(a,e11.4)') shift//'tol_spinup ',params%tol_spinup
+  write(*,'(a,l1)')    shift//'sstemp_spinup ',params%sstemp_spinup
+  write(*,'(a,e11.4)') shift//'sstemp_viscosity_spinup ',params%sstemp_viscosity_spinup
+  write(*,'(a,l1)')    shift//'all_surf_fixed_spinup ',params%all_surf_fixed_spinup
   do i=1,params%ns
     write(*,'(a,i4,a,i4)')    shift//'surface ',i,' material_spinup ',surface(i)%material_spinup
   enddo
+  write(*,'(a,l1)')    shift//'fixed_cloud_spinup ',params%fixed_cloud_spinup
   write(*,'(a)')       shift//'--- TIMESTEPPING ---'
   write(*,'(a,e11.4)') shift//'dt_main ',params%dt_main
   write(*,'(a,e11.4)') shift//'dt ',params%dt
@@ -1481,9 +1518,14 @@ if (params%debug.gt.1) then
   write(threadinfo%Logunit,'(a32,e11.4)') 'dt_spinup ',params%dt_spinup
   write(threadinfo%Logunit,'(a32,i4)')    'griditer_spinup ',params%griditer_spinup
   write(threadinfo%Logunit,'(a32,i4)')    'nonlinear_iterations_spinup ',params%nonlinear_iterations_spinup
+  write(threadinfo%Logunit,'(a32,e11.4)') 'tol_spinup ',params%tol_spinup
+  write(threadinfo%Logunit,'(a32,l1)')    'sstemp_spinup ',params%sstemp_spinup
+  write(threadinfo%Logunit,'(a32,e11.4)') 'sstemp_viscosity_spinup ',params%sstemp_viscosity_spinup
+  write(threadinfo%Logunit,'(a32,l1)')    'all_surf_fixed_spinup ',params%all_surf_fixed_spinup
   do i=1,params%ns
         write(threadinfo%Logunit,'(a32,i4,a,i4)')    'surface ',i,' material_spinup ',surface(i)%material_spinup
   enddo
+  write(threadinfo%Logunit,'(a32,l1)')    'fixed_cloud_spinup ',params%fixed_cloud_spinup
   write(threadinfo%Logunit,'(a)')         '--- TIMESTEPPING ---'
   write(threadinfo%Logunit,'(a32,e11.4)') 'dt_main ',params%dt_main
   write(threadinfo%Logunit,'(a32,e11.4)') 'dt ',params%dt