Merge pull request #681 from rpeacoc/master

CFAST: Add input check for vent openign by flux or temperature to ensure there is an associated target. Addresses part of Issue #675.
firemodels · Apr 26, 2017 · 0589e0a · 0589e0a
2 parents b4f7b25 + 650a8ea
commit 0589e0a
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/Source/CFAST/input.f90 b/Source/CFAST/input.f90
@@ -957,10 +957,16 @@ subroutine keywordcases(inumr,inumc)
                     if (lcarray(10)=='TEMP') ventptr%opening_type = trigger_by_temp
                     if (lcarray(10)=='FLUX') ventptr%opening_type = trigger_by_flux
                     ventptr%opening_criterion = lrarray(11)
+                    ventptr%opening_target = 0
                     do i = 1,n_targets
                         targptr => targetinfo(i)
                         if (targptr%name==lcarray(12)) ventptr%opening_target = i
                     end do
+                    if (ventptr%opening_target==0) then
+                        write (*,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                        write (iofill,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                        stop
+                    end if   
                     ventptr%opening_initial_fraction = lrarray(14)
                     ventptr%opening_final_fraction = lrarray(16)
                     if (stpmax>0) then
@@ -1156,10 +1162,16 @@ subroutine keywordcases(inumr,inumc)
                         if (lcarray(6)=='TEMP') ventptr%opening_type = trigger_by_temp
                         if (lcarray(6)=='FLUX') ventptr%opening_type = trigger_by_flux
                         ventptr%opening_criterion = lrarray(7)
+                        ventptr%opening_target = 0
                         do i = 1,n_targets
                             targptr => targetinfo(i)
                             if (targptr%name==lcarray(8)) ventptr%opening_target = i
                         end do
+                        if (ventptr%opening_target==0) then
+                            write (*,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                            write (iofill,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                            stop
+                        end if  
                         ventptr%opening_initial_fraction = lrarray(10)
                         ventptr%opening_final_fraction = lrarray(12)
                         if (stpmax>0) then
@@ -1248,10 +1260,16 @@ subroutine keywordcases(inumr,inumc)
                         if (lcarray(13)=='TEMP') ventptr%opening_type = trigger_by_temp
                         if (lcarray(13)=='FLUX') ventptr%opening_type = trigger_by_flux
                         ventptr%opening_criterion = lrarray(14)
+                        ventptr%opening_target = 0
                         do i = 1,n_targets
                             targptr => targetinfo(i)
                             if (targptr%name==lcarray(15)) ventptr%opening_target = i
                         end do
+                        if (ventptr%opening_target==0) then
+                            write (*,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                            write (iofill,*) '***Error: Bad HVENT input. Vent opening specification requires an associated target.'
+                            stop
+                        end if  
                         ventptr%opening_initial_fraction = lrarray(17)
                         ventptr%opening_final_fraction = lrarray(19)
                     end if