Merge remote-tracking branch 'github/master'

Author: drjfloyd

Source/func.f90

@@ -285,7 +285,7 @@ SUBROUTINE SEARCH_INPUT_FILE(LU,TEXT,FOUND)
 INTEGER, INTENT(IN) :: LU
 LOGICAL, INTENT(OUT) :: FOUND
 CHARACTER(*), INTENT(IN) :: TEXT
-CHARACTER(180) :: LINE
+CHARACTER(NAMELIST_LENGTH) :: LINE
 INTEGER :: IND
 
 FOUND = .FALSE.

Source/prec.f90

@@ -25,7 +25,8 @@ MODULE PRECISION_PARAMETERS
 INTEGER, PARAMETER :: MESSAGE_LENGTH=200             !< Maximum length of error and warning labels
 INTEGER, PARAMETER :: FORMULA_LENGTH=255             !< Maximum length of chemical formulae
 INTEGER, PARAMETER :: CHID_LENGTH=50                 !< Maximum length of job ID
-INTEGER, PARAMETER :: FILE_LENGTH=200                      !< Maximum length of filenames ID
+INTEGER, PARAMETER :: FILE_LENGTH=200                !< Maximum length of filenames ID
+INTEGER, PARAMETER :: NAMELIST_LENGTH=300            !< Maximum length of NAMELIST line in input file (see SEARCH_INPUT_FILE)
 INTEGER, PARAMETER :: MESH_STRING_LENGTH=LABEL_LENGTH + 80 !< Length for storage of strings
 INTEGER, PARAMETER :: FN_LENGTH=FILE_LENGTH+CHID_LENGTH    !< Length for output filename strings (includes output directory)
 INTEGER, PARAMETER :: N_OUTPUT_QUANTITIES=600        !< Dimension of array that holds names of output quantities

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_10p5O2_25_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_10p5O2_40_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_21O2_25_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1)=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1)=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_21O2_40_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_N2_25_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=25./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/

Validation/Kashiwagi_Gasification/FDS_Input_Files/pine_N2_40_3C.fds

@@ -10,8 +10,8 @@
 &VENT DB='ZMAX', SURF_ID='OPEN'/
 
 &SURF ID='inflow', VEL=-0.005, COLOR='BLUE'/
-&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='BROWN'/
-&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION(1:3)=0.05,0.05,0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
+&SURF ID='sample',         STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='BROWN'/
+&SURF ID='exposed sample', STRETCH_FACTOR=1, THICKNESS=0.038, BACKING='EXPOSED', MATL_ID(1,1:3) = 'PINE 1','PINE 2','PINE 3', MATL_MASS_FRACTION(1,1:3) = 0.55,0.1,0.35, MOISTURE_FRACTION=0.05, COLOR='GRAY 10', EXTERNAL_FLUX=40./
 &SURF ID='default wall', EMISSIVITY=0., HEAT_TRANSFER_COEFFICIENT=0., COLOR='INVISIBLE', FREE_SLIP=T, DEFAULT=T/
 
 &OBST XB=0,0.038,-0.019,0.019,-0.019,0.019, SURF_ID6='exposed sample','sample','sample','sample','sample','sample'/