FDS Source: Clean up ONE_D

Author: mcgratta

Source/func.f90

@@ -659,6 +659,7 @@ MODULE COMP_OPERATORS
    MODULE PROCEDURE EQUATE_INTEGERS
    MODULE PROCEDURE EQUATE_INTEGER_VECTORS
    MODULE PROCEDURE EQUATE_LOGICALS
+   MODULE PROCEDURE EQUATE_LOGICAL_VECTORS
 END INTERFACE
 
 CONTAINS
@@ -715,6 +716,16 @@ SUBROUTINE EQUATE_LOGICALS(A,B,SWAP)
 ENDIF
 END SUBROUTINE EQUATE_LOGICALS
 
+SUBROUTINE EQUATE_LOGICAL_VECTORS(A,B,SWAP)
+LOGICAL, INTENT(INOUT), DIMENSION(:) :: A,B
+LOGICAL, INTENT(IN) :: SWAP
+IF (SWAP) THEN
+   B = A
+ELSE
+   A = B
+ENDIF
+END SUBROUTINE EQUATE_LOGICAL_VECTORS
+
 END MODULE COMP_OPERATORS
 
 
@@ -1787,61 +1798,38 @@ SUBROUTINE PACK_BOUNDARY_ONE_D(NM,IC,RC,LC,OS,OD_INDEX,UNPACK_IT,COUNT_ONLY)
 ENDDO
 
 DO NN=1,ONE_D%N_MATL
-   IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC) , ONE_D%MATL_INDEX(NN) , UNPACK_IT)
-ENDDO
-
-RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%PYROLYSIS_DEPTH , UNPACK_IT)
- 
-I1 = RC+1 ; RC = I1 + ONE_D%N_MATL - 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%M_DOT_S_PP(1:RC-I1+1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_MAX
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%X(0:RC-I1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_OLD - 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%DX_OLD(1:RC-I1+1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_MAX + 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%TMP(0:RC-I1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_MAX + 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%DELTA_TMP(0:RC-I1) , UNPACK_IT)
-
-DO NL=1,ONE_D%N_LAYERS
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%LAYER_THICKNESS(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%LAYER_THICKNESS_OLD(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%MINIMUM_LAYER_THICKNESS(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%MIN_DIFFUSIVITY(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%DDSUM(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%SMALLEST_CELL_SIZE(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%STRETCH_FACTOR(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%HEAT_SOURCE(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%CELL_SIZE_FACTOR(NL) , UNPACK_IT)
-   RC=RC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC) , ONE_D%CELL_SIZE(NL) , UNPACK_IT)
-   LC=LC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%LOGICALS(LC) , ONE_D%HT3D_LAYER(NL) , UNPACK_IT)
+IC=IC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%INTEGERS(IC) , ONE_D%MATL_INDEX(NN) , UNPACK_IT)
 ENDDO
 
-LC=LC+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%LOGICALS(LC) , ONE_D%INTERNAL_RADIATION , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_MAX - 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%RHO_C_S(1:RC-I1+1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_CELLS_MAX + 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%K_S(0:RC-I1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_LPC - 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%PART_MASS(1:RC-I1+1) , UNPACK_IT)
-
-I1 = RC+1 ; RC = I1 + ONE_D%N_LPC - 1
-IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%PART_ENTHALPY(1:RC-I1+1) , UNPACK_IT)
+RC=RC+1                             ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(RC)   ,ONE_D%PYROLYSIS_DEPTH        , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_MATL-1      ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%M_DOT_S_PP(1:RC-I1+1)  , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX   ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%X(0:RC-I1)             , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_OLD-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%DX_OLD(1:RC-I1+1)      , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%TMP(0:RC-I1)           , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%DELTA_TMP(0:RC-I1)     , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%RHO_C_S(1:RC-I1+1)     , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX+1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%K_S(0:RC-I1)           , UNPACK_IT)
+
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%LAYER_THICKNESS(1:RC-I1+1)    , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%LAYER_THICKNESS_OLD(1:RC-I1+1), UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%MIN_LAYER_THICKNESS(1:RC-I1+1), UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%MIN_DIFFUSIVITY(1:RC-I1+1)    , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%DDSUM(1:RC-I1+1)              , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%SMALLEST_CELL_SIZE(1:RC-I1+1) , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%STRETCH_FACTOR(1:RC-I1+1)     , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%HEAT_SOURCE(1:RC-I1+1)        , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%CELL_SIZE_FACTOR(1:RC-I1+1)   , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%CELL_SIZE(1:RC-I1+1)          , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LPC-1    ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%PART_MASS(1:RC-I1+1)          , UNPACK_IT)
+I1=RC+1 ; RC=I1+ONE_D%N_LPC-1    ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC),ONE_D%PART_ENTHALPY(1:RC-I1+1)      , UNPACK_IT)
+
+LC=LC+1                          ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%LOGICALS(LC)    , ONE_D%INTERNAL_RADIATION    , UNPACK_IT)
+I1=LC+1 ; LC=I1+ONE_D%N_LAYERS-1 ; IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%LOGICALS(I1:LC) , ONE_D%HT3D_LAYER(1:LC-I1+1) , UNPACK_IT)
 
 DO NN=1,ONE_D%N_MATL
-   I1 = RC+1 ; RC = I1 + ONE_D%N_LAYERS - 1
+   I1=RC+1 ; RC=I1+ONE_D%N_LAYERS-1
    IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%MATL_COMP(NN)%MASS_FRACTION(1:RC-I1+1) , UNPACK_IT)
-ENDDO
-
-DO NN=1,ONE_D%N_MATL
-   I1 = RC+1 ; RC = I1 + (ONE_D%N_CELLS_MAX+2) - 1
+   I1=RC+1 ; RC=I1+ONE_D%N_CELLS_MAX+1
    IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:RC) , ONE_D%MATL_COMP(NN)%RHO(0:RC-I1) , UNPACK_IT)
 ENDDO
 
@@ -1866,8 +1854,8 @@ SUBROUTINE REALLOCATE_BOUNDARY_ONE_D(ONE_D)
 IF (ALLOCATED(ONE_D%LAYER_THICKNESS)) DEALLOCATE(ONE_D%LAYER_THICKNESS)       ; ALLOCATE(ONE_D%LAYER_THICKNESS(ONE_D%N_LAYERS))
 IF (ALLOCATED(ONE_D%LAYER_THICKNESS_OLD)) DEALLOCATE(ONE_D%LAYER_THICKNESS_OLD) 
    ALLOCATE(ONE_D%LAYER_THICKNESS_OLD(ONE_D%N_LAYERS))
-IF (ALLOCATED(ONE_D%MINIMUM_LAYER_THICKNESS)) DEALLOCATE(ONE_D%MINIMUM_LAYER_THICKNESS)       
-   ALLOCATE(ONE_D%MINIMUM_LAYER_THICKNESS(ONE_D%N_LAYERS))
+IF (ALLOCATED(ONE_D%MIN_LAYER_THICKNESS)) DEALLOCATE(ONE_D%MIN_LAYER_THICKNESS)       
+   ALLOCATE(ONE_D%MIN_LAYER_THICKNESS(ONE_D%N_LAYERS))
 IF (ALLOCATED(ONE_D%HT3D_LAYER)) DEALLOCATE(ONE_D%HT3D_LAYER)                 ; ALLOCATE(ONE_D%HT3D_LAYER(ONE_D%N_LAYERS))
 IF (ALLOCATED(ONE_D%MIN_DIFFUSIVITY)) DEALLOCATE(ONE_D%MIN_DIFFUSIVITY)       ; ALLOCATE(ONE_D%MIN_DIFFUSIVITY(ONE_D%N_LAYERS))
 IF (ALLOCATED(ONE_D%RHO_C_S)) DEALLOCATE(ONE_D%RHO_C_S)                       ; ALLOCATE(ONE_D%RHO_C_S(ONE_D%N_CELLS_MAX))
@@ -1942,7 +1930,7 @@ SUBROUTINE INITIALIZE_BOUNDARY_ONE_D(NM,OD_INDEX,SURF_INDEX)
 ENDIF
 ONE_D%DELTA_TMP = 0._EB
 ONE_D%LAYER_THICKNESS(1:ONE_D%N_LAYERS) = SF%LAYER_THICKNESS(1:SF%N_LAYERS)
-ONE_D%MINIMUM_LAYER_THICKNESS(1:ONE_D%N_LAYERS) = SF%MINIMUM_LAYER_THICKNESS(1:SF%N_LAYERS)
+ONE_D%MIN_LAYER_THICKNESS(1:ONE_D%N_LAYERS) = SF%MIN_LAYER_THICKNESS(1:SF%N_LAYERS)
 ONE_D%HT3D_LAYER(1:ONE_D%N_LAYERS) = SF%HT3D_LAYER(1:SF%N_LAYERS)
 ONE_D%MIN_DIFFUSIVITY(1:ONE_D%N_LAYERS) = SF%MIN_DIFFUSIVITY(1:SF%N_LAYERS)
 ONE_D%STRETCH_FACTOR(1:ONE_D%N_LAYERS)  = SF%STRETCH_FACTOR(1:SF%N_LAYERS)

Source/init.f90

@@ -3804,7 +3804,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
            N_MATL_OBST,N_LAYERS,N_MATLS,IIF,JJF,KKF
 INTEGER, DIMENSION(MAX_MATERIALS) :: MATL_INDEX_OBST,MATL_INDEX
 REAL(EB), DIMENSION(MAX_LAYERS,MAX_MATERIALS) :: MATL_MASS_FRACTION_OBST,MATL_MASS_FRACTION
-REAL(EB), DIMENSION(0:MAX_LAYERS) :: LAYER_THICKNESS,MINIMUM_LAYER_THICKNESS
+REAL(EB), DIMENSION(0:MAX_LAYERS) :: LAYER_THICKNESS,MIN_LAYER_THICKNESS
 REAL(EB), DIMENSION(MAX_LAYERS) :: LAYER_THICKNESS_OBST,HEAT_SOURCE,HEAT_SOURCE_OBST,&
                                    STRETCH_FACTOR,STRETCH_FACTOR_OBST,CELL_SIZE,CELL_SIZE_OBST,&
                                    CELL_SIZE_FACTOR,CELL_SIZE_FACTOR_OBST
@@ -4044,7 +4044,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
    MATL_INDEX(1:N_MATLS) = MATL_INDEX_OBST(1:N_MATLS)  ! MATL_INDEX_OBST is taken from the OBSTs that make up the solid
    MATL_MASS_FRACTION = 0._EB
    LAYER_THICKNESS = 0._EB
-   MINIMUM_LAYER_THICKNESS = 0._EB
+   MIN_LAYER_THICKNESS = 0._EB
    HT3D_LAYER = .FALSE.
    FRONT_LINING_THICKNESS = 0._EB
    BACK_LINING_THICKNESS = 0._EB
@@ -4077,7 +4077,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
       IF (.NOT.SF%LINING) EXIT
       N_LAYERS = N_LAYERS + 1
       LAYER_THICKNESS(N_LAYERS)  = SF%LAYER_THICKNESS(N_LAYERS) 
-      MINIMUM_LAYER_THICKNESS(N_LAYERS)  = SF%MINIMUM_LAYER_THICKNESS(N_LAYERS) 
+      MIN_LAYER_THICKNESS(N_LAYERS)  = SF%MIN_LAYER_THICKNESS(N_LAYERS) 
       HT3D_LAYER(N_LAYERS)       = .FALSE.
       HEAT_SOURCE(N_LAYERS)      = SF%HEAT_SOURCE(N_LAYERS)
       RAMP_IHS_INDEX(N_LAYERS)   = SF%RAMP_IHS_INDEX(N_LAYERS)
@@ -4103,7 +4103,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
    DO NL=1,N_LAYERS_OBST
       N_LAYERS = N_LAYERS + 1
       LAYER_THICKNESS(N_LAYERS)  = LAYER_THICKNESS_OBST(NL)
-      MINIMUM_LAYER_THICKNESS(N_LAYERS) = SF%MINIMUM_LAYER_THICKNESS(1)
+      MIN_LAYER_THICKNESS(N_LAYERS) = SF%MIN_LAYER_THICKNESS(1)
       HT3D_LAYER(N_LAYERS)       = .TRUE.
       HEAT_SOURCE(N_LAYERS)      = HEAT_SOURCE_OBST(NL)
       RAMP_IHS_INDEX(N_LAYERS)   = RAMP_IHS_INDEX_OBST(NL)
@@ -4124,7 +4124,7 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
       IF (.NOT.SF_BACK%LINING) EXIT
       N_LAYERS = N_LAYERS + 1
       LAYER_THICKNESS(N_LAYERS)  = SF_BACK%LAYER_THICKNESS(SF_BACK%N_LAYERS-NL+1)
-      MINIMUM_LAYER_THICKNESS(N_LAYERS)  = SF_BACK%MINIMUM_LAYER_THICKNESS(SF_BACK%N_LAYERS-NL+1)
+      MIN_LAYER_THICKNESS(N_LAYERS)  = SF_BACK%MIN_LAYER_THICKNESS(SF_BACK%N_LAYERS-NL+1)
       HT3D_LAYER(N_LAYERS)       = .FALSE.
       HEAT_SOURCE(N_LAYERS)      = SF_BACK%HEAT_SOURCE(SF_BACK%N_LAYERS-NL+1)
       RAMP_IHS_INDEX(N_LAYERS)   = SF_BACK%RAMP_IHS_INDEX(SF_BACK%N_LAYERS-NL+1)
@@ -4147,10 +4147,10 @@ SUBROUTINE FIND_WALL_BACK_INDEX(NM,IW)
    DEALLOCATE(ONE_D%MATL_COMP)       ; ALLOCATE(ONE_D%MATL_COMP(ONE_D%N_MATL))
    DEALLOCATE(ONE_D%MATL_INDEX)      ; ALLOCATE(ONE_D%MATL_INDEX(ONE_D%N_MATL))
    DEALLOCATE(ONE_D%LAYER_THICKNESS) ; ALLOCATE(ONE_D%LAYER_THICKNESS(ONE_D%N_LAYERS))
-   DEALLOCATE(ONE_D%MINIMUM_LAYER_THICKNESS) ; ALLOCATE(ONE_D%MINIMUM_LAYER_THICKNESS(ONE_D%N_LAYERS))
+   DEALLOCATE(ONE_D%MIN_LAYER_THICKNESS) ; ALLOCATE(ONE_D%MIN_LAYER_THICKNESS(ONE_D%N_LAYERS))
    DEALLOCATE(ONE_D%HT3D_LAYER)      ; ALLOCATE(ONE_D%HT3D_LAYER(ONE_D%N_LAYERS))
    ONE_D%LAYER_THICKNESS(1:ONE_D%N_LAYERS) = LAYER_THICKNESS(1:ONE_D%N_LAYERS)
-   ONE_D%MINIMUM_LAYER_THICKNESS(1:ONE_D%N_LAYERS) = MINIMUM_LAYER_THICKNESS(1:ONE_D%N_LAYERS)
+   ONE_D%MIN_LAYER_THICKNESS(1:ONE_D%N_LAYERS) = MIN_LAYER_THICKNESS(1:ONE_D%N_LAYERS)
    ONE_D%HT3D_LAYER(1:ONE_D%N_LAYERS) = HT3D_LAYER(1:ONE_D%N_LAYERS)
    DO NN=1,ONE_D%N_MATL
       ALLOCATE(ONE_D%MATL_COMP(NN)%MASS_FRACTION(ONE_D%N_LAYERS))

Source/read.f90

@@ -6290,7 +6290,7 @@ SUBROUTINE PROC_PART
                VOLUME = VOLUME + AREA_FACTOR*(R_O**3-R_I**3)
          END SELECT
       ENDDO
-      LPC%KILL_RADIUS = MINVAL(SF%MINIMUM_LAYER_THICKNESS(1:SF%N_LAYERS))
+      LPC%KILL_RADIUS = MINVAL(SF%MIN_LAYER_THICKNESS(1:SF%N_LAYERS))
       LPC%DENSITY = MASS/VOLUME
       LPC%INITIAL_MASS = MASS
       LPC%FTPR = FOTH*PI*LPC%DENSITY
@@ -8558,17 +8558,17 @@ SUBROUTINE READ_SURF(QUICK_READ)
    ALLOCATE(SF%SMALLEST_CELL_SIZE(MAX_LAYERS))      ; SF%SMALLEST_CELL_SIZE = 0._EB
    ALLOCATE(SF%HEAT_SOURCE(MAX_LAYERS))             ; SF%HEAT_SOURCE = 0._EB
    ALLOCATE(SF%RAMP_IHS_INDEX(MAX_LAYERS))          ; SF%RAMP_IHS_INDEX = 0
-   ALLOCATE(SF%MINIMUM_LAYER_THICKNESS(MAX_LAYERS)) ; SF%MINIMUM_LAYER_THICKNESS = 0._EB
+   ALLOCATE(SF%MIN_LAYER_THICKNESS(MAX_LAYERS))     ; SF%MIN_LAYER_THICKNESS = 0._EB
    ALLOCATE(SF%SWELL_RATIO(MAX_LAYERS))             ; SF%SWELL_RATIO = 1._EB
 
    COUNT_LAYERS: DO NL=1,MAX_LAYERS
       IF (THICKNESS(NL) < 0._EB) EXIT COUNT_LAYERS
       SF%N_LAYERS = SF%N_LAYERS + 1
       SF%LAYER_THICKNESS(NL) = THICKNESS(NL)
       IF (MINIMUM_LAYER_THICKNESS(NL)<0._EB) THEN
-         SF%MINIMUM_LAYER_THICKNESS(NL) = MIN(0.1_EB*SF%LAYER_THICKNESS(NL),ABS(MINIMUM_LAYER_THICKNESS(NL)))
+         SF%MIN_LAYER_THICKNESS(NL) = MIN(0.1_EB*SF%LAYER_THICKNESS(NL),ABS(MINIMUM_LAYER_THICKNESS(NL)))
       ELSE
-         SF%MINIMUM_LAYER_THICKNESS(NL) = MINIMUM_LAYER_THICKNESS(NL)
+         SF%MIN_LAYER_THICKNESS(NL) = MINIMUM_LAYER_THICKNESS(NL)
       ENDIF
       SF%N_LAYER_MATL(NL) = 0
       EMISSIVITY = 0._EB