Rename files, modules, and routines to include Runge-Kutta

MALI-Dev · Sep 4, 2023 · 9e168f4 · 9e168f4
1 parent 2cd9970
commit 9e168f4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/components/mpas-albany-landice/src/landice.cmake b/components/mpas-albany-landice/src/landice.cmake
@@ -57,7 +57,7 @@ list(APPEND RAW_SOURCES
   core_landice/mode_forward/mpas_li_core.F
   core_landice/mode_forward/mpas_li_core_interface.F
   core_landice/mode_forward/mpas_li_time_integration.F
-  core_landice/mode_forward/mpas_li_time_integration_fe.F
+  core_landice/mode_forward/mpas_li_time_integration_fe_rk.F
   core_landice/mode_forward/mpas_li_diagnostic_vars.F
   core_landice/mode_forward/mpas_li_advection.F
   core_landice/mode_forward/mpas_li_calving.F

diff --git a/components/mpas-albany-landice/src/mode_forward/Makefile b/components/mpas-albany-landice/src/mode_forward/Makefile
@@ -4,7 +4,7 @@
 OBJS =  mpas_li_core.o \
     mpas_li_core_interface.o \
     mpas_li_time_integration.o \
-    mpas_li_time_integration_fe.o \
+    mpas_li_time_integration_fe_rk.o \
     mpas_li_diagnostic_vars.o \
     mpas_li_advection.o \
     mpas_li_advection_fct_shared.o \
@@ -35,9 +35,9 @@ mpas_li_core.o: mpas_li_time_integration.o \
                      mpas_li_statistics.o \
                      mpas_li_calving.o
 
-mpas_li_time_integration.o: mpas_li_time_integration_fe.o
+mpas_li_time_integration.o: mpas_li_time_integration_fe_rk.o
 
-mpas_li_time_integration_fe.o: mpas_li_advection.o \
+mpas_li_time_integration_fe_rk.o: mpas_li_advection.o \
 	                       mpas_li_calving.o \
                                mpas_li_thermal.o \
 			       mpas_li_iceshelf_melt.o \

diff --git a/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration.F b/components/mpas-albany-landice/src/mode_forward/mpas_li_time_integration.F
@@ -26,7 +26,7 @@ module li_time_integration
    use mpas_timekeeping
    use mpas_log
 
-   use li_time_integration_fe
+   use li_time_integration_fe_rk
    use li_setup
    use li_constants
 
@@ -166,9 +166,9 @@ subroutine li_timestep(domain, err)
       !call mpas_log_write('Using ' // trim(config_time_integration) // ' time integration.')
       select case (config_time_integration)
       case ('forward_euler')
-         call li_time_integrator_forwardeuler(domain, err_tmp)
+         call li_time_integrator_forwardeuler_rungekutta(domain, err_tmp)
       case ('runge_kutta')
-         call li_time_integrator_forwardeuler(domain, err_tmp)
+         call li_time_integrator_forwardeuler_rungekutta(domain, err_tmp)
       case default
          call mpas_log_write(trim(config_time_integration) // ' is not a valid land ice time integration option.', MPAS_LOG_ERR)
          err_tmp = 1

diff --git a/...ode_forward/mpas_li_time_integration_fe.F → ..._forward/mpas_li_time_integration_fe_rk.F b/...ode_forward/mpas_li_time_integration_fe.F → ..._forward/mpas_li_time_integration_fe_rk.F
@@ -9,17 +9,17 @@
 
 !|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 !
-!  li_time_integration_fe
+!  li_time_integration_fe_rk
 !
-!> \brief MPAS land ice Forward Euler time integration scheme
-!> \author Matt Hoffman
-!> \date   17 April 2011
+!> \brief MPAS land ice Forward Euler and Runge-Kutta time integration schemes
+!> \author Matt Hoffman, Trevor Hillebrand
+!> \date   17 April 2011, Runge-Kutta added Sept 2023
 !> \details
-!>  This module contains the Forward Euler time integration scheme
+!>  This module contains the Forward Euler and Runge-Kutta time integration schemes
 !
 !-----------------------------------------------------------------------
 
-module li_time_integration_fe
+module li_time_integration_fe_rk
 
    use mpas_derived_types
    use mpas_pool_routines
@@ -52,7 +52,7 @@ module li_time_integration_fe
    !
    !--------------------------------------------------------------------
 
-   public :: li_time_integrator_forwardeuler
+   public :: li_time_integrator_forwardeuler_rungekutta
 
    !--------------------------------------------------------------------
    !
@@ -68,16 +68,16 @@ module li_time_integration_fe
 
 !***********************************************************************
 !
-!  routine li_time_integrator_forwardeuler
+!  routine li_time_integrator_forwardeuler_rungekutta
 !
-!> \brief   Forward Euler time integration scheme
+!> \brief   Forward Euler and Runge-Kutta time integration schemes
 !> \author  Matthew Hoffman
 !> \date    10 January 2012
 !> \details
-!>  This routine performs Forward Euler time integration.
+!>  This routine performs Forward Euler and Runge-Kutta time integration.
 !
 !-----------------------------------------------------------------------
-   subroutine li_time_integrator_forwardeuler(domain, err)
+   subroutine li_time_integrator_forwardeuler_rungekutta(domain, err)
 
       use li_subglacial_hydro
       use li_velocity
@@ -424,7 +424,7 @@ subroutine li_time_integrator_forwardeuler(domain, err)
 
       ! === error check
       if (err == 1) then
-          call mpas_log_write("An error has occurred in li_time_integrator_forwardeuler.", MPAS_LOG_ERR)
+          call mpas_log_write("An error has occurred in li_time_integrator_forwardeuler_rungekutta.", MPAS_LOG_ERR)
       endif
 
       deallocate(temperatureProv)
@@ -435,7 +435,7 @@ subroutine li_time_integrator_forwardeuler(domain, err)
       deallocate(passiveTracer3dProv)
       deallocate(passiveTracer3d)
    !--------------------------------------------------------------------
-   end subroutine li_time_integrator_forwardeuler
+   end subroutine li_time_integrator_forwardeuler_rungekutta
 
 
 
@@ -1412,5 +1412,5 @@ subroutine advance_clock(domain, err)
     end subroutine advance_clock
 
 
-end module li_time_integration_fe
+end module li_time_integration_fe_rk