Merge pull request #15252 from ericvmueller/master

FDS Source: prevent mixing of SURFACE_OXIDATION_MODEL and OXPYRO model

Author: ericvmueller

Source/read.f90

@@ -6431,7 +6431,7 @@ SUBROUTINE PROC_PART
 
       DO NN=1,SF%N_MATL
          ML => MATERIAL(NN)
-         IF ( ANY(ML%N_O2>0._EB) ) OXPYRO_MODEL = .TRUE.
+         IF ( ANY(ML%N_O2>0._EB) .AND. (ML%PYROLYSIS_MODEL /= PYROLYSIS_SURFACE_OXIDATION) ) OXPYRO_MODEL = .TRUE.
       ENDDO
 
    ENDIF THERMALLY_THICK_IF
@@ -9842,7 +9842,7 @@ SUBROUTINE PROC_WALL
             ML => MATERIAL(SF%LAYER_CHILD_INDEX(NL,N))
             IF (ANY(ML%NU_RESIDUE>0._EB)) CAN_SWELL = .TRUE.
             IF (ML%ALLOW_SWELLING) DENSITY_MIN = MIN(DENSITY_MIN,ML%RHO_S)
-            IF ( ANY(ML%N_O2>0._EB) ) OXPYRO_MODEL = .TRUE.
+            IF ( ANY(ML%N_O2>0._EB) .AND. (ML%PYROLYSIS_MODEL /= PYROLYSIS_SURFACE_OXIDATION) ) OXPYRO_MODEL = .TRUE.
          ENDDO
 
          IF (DENSITY_MIN>TWO_EPSILON_EB .AND. CAN_SWELL) SF%SWELL_RATIO(NL) = MAX(1._EB,SF%LAYER_DENSITY(NL)/DENSITY_MIN)