FireX: Merge with firemodels/master

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -14483,7 +14483,7 @@ \chapter{Error Codes}
     \>                                                                                \>                          \\
 901 \> \ct{CTRL ... must have a FUNCTION_TYPE.} \> Section~\ref{info:basic_control} \\
 902 \> \ct{CTRL ... PID controller must be given a TARGET_VALUE.} \> Section~\ref{info:CONTROL_PID} \\
-903 \> \ct{CTRL ... FUNCTION_TYPE not recognized.} \> Section~\ref{info:basic_control} \\
+903 \> \ct{CTRL ... FUNCTION_TYPE not recognized.} \> Section~\ref{info:CTRL} \\
 904 \> \ct{CTRL ... FUNCTION_TYPE=EXTERNAL but no EXTERNAL_FILENAME given.} \> Section~\ref{info:external_control} \\
 905 \> \ct{CTRL ... must have at least one input.} \> Section~\ref{info:CTRL} \\
 906 \> \ct{CTRL ... must have only one input.} \> Section~\ref{info:CTRL} \\
@@ -14537,8 +14537,8 @@ \chapter{Error Codes}
 1015 \> \ct{Output QUANTITY ... requires a QUANTITY2.} \> Section~\ref{info:gasoutputquantities} \\
 1016 \> \ct{Output QUANTITY ... requires a SPEC_ID.} \> Section~\ref{info:gasoutputquantities} \\
 1017 \> \ct{Output QUANTITY ... SPEC_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
-1018 \> \ct{Output QUANTITY ... requires a MATL_ID.} \> Section~\ref{info:gasoutputquantities} \\
-1019 \> \ct{Output QUANTITY ... MATL_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
+1018 \> \ct{Output QUANTITY ... requires a MATL_ID.} \> Section~\ref{info:solidoutputquantities} \\
+1019 \> \ct{Output QUANTITY ... MATL_ID ... not found.} \> Section~\ref{info:solidoutputquantities} \\
 1020 \> \ct{Output QUANTITY ... requires a PART_ID.} \> Section~\ref{info:gasoutputquantities} \\
 1021 \> \ct{Output QUANTITY ... PART_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
 1022 \> \ct{Output QUANTITY ... requires a DUCT_ID.} \> Section~\ref{info:hvacoutputquantities} \\
@@ -14562,14 +14562,14 @@ \chapter{Error Codes}
 1040 \> \ct{QUANTITY ... is not appropriate for gas phase.} \> Section~\ref{info:gasoutputquantities} \\
 1041 \> \ct{QUANTITY ... is not appropriate for Plot3D.} \> Section~\ref{info:gasoutputquantities} \\
 1042 \> \ct{QUANTITY ... not found.} \> Section~\ref{info:gasoutputquantities} \\
-1043 \> \ct{PROP_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
+1043 \> \ct{PROP_ID ... not found.} \> Section~\ref{info:THERMOCOUPLE} \\
 1044 \> \ct{Cannot set EXTERNAL_FILE=T for a RAMP used for an output clock ...} \> Section~\ref{info:external_control} \\
 1045 \> \ct{QUANTITY ... requires a PART_ID for particles with mass.} \> Section~\ref{tab:particleoutputquantities} \\
 \\
 1050 \> \ct{The file ... does not exist. Set RESTART=.FALSE.} \> Section~\ref{info:restart} \\
 1051 \> \ct{RESTART initial time equals T_END.} \> Section~\ref{info:restart} \\
 1052 \> \ct{On TIME, do not set both RAMP_TIME and RAMP_DT.} \> Section~\ref{info:simulation_time_ramp} \\
-1053 \> \ct{One TIME, if one of DT_EXTERNAL_HEARTBEAT or} \> Section~\ref{info:external_control} \\
+1053 \> \ct{On TIME, if one of DT_EXTERNAL_HEARTBEAT or} \> Section~\ref{info:external_control} \\
      \> \ct{EXTERNAL_HEARTBEAT_FILENAME is set, both must be set.} \\
 \\
 1054 \> \ct{On MULT, must set DX if I_UPPER-I_LOWER>0, etc.} \> Section~\ref{info:MULT} \\

Source/geom.f90

@@ -23859,11 +23859,7 @@ SUBROUTINE READ_GEOM
 
 CC_IBM = .TRUE.
 
-! If unstructured projection defined set Pressure solver on unstructured grid.
-IF (PRES_FLAG/=UGLMAT_FLAG) THEN
-   PRES_METHOD = 'ULMAT'
-   PRES_FLAG   = ULMAT_FLAG
-ENDIF
+! For unstructured projection define Pressure solver on unstructured grid.
 PRES_ON_WHOLE_DOMAIN = .FALSE.
 IF (ABS(CCVOL_LINK-0.95_EB)<TWENTY_EPSILON_EB) CCVOL_LINK = DEFAULT_VOLFRAC_LINK
 IF (CHECK_POISSON) GLMAT_VERBOSE=.TRUE.

Source/hvac.f90

@@ -1559,11 +1559,13 @@ SUBROUTINE MATRIX_SOLVE
 RHS(1:NE%N_MATRIX) = RHS_GAUSSJ(1:NE%N_MATRIX)
 DEALLOCATE(LHS_GAUSSJ)
 DEALLOCATE(RHS_GAUSSJ)
+
 DO ND = 1,NE%N_DUCTS
    DU=>DUCT(NE%DUCT_INDEX(ND))
    IF (DU%FIXED .OR. DU%AREA < TWENTY_EPSILON_EB) CYCLE
-   DU%VEL(NEW) = RHS(NE%MATRIX_INDEX(ND))
+   DU%VEL(NEW) = RHS(NE%MATRIX_INDEX(NE%DUCT_INDEX(ND)))
 ENDDO
+
 DO NN = 1,NE%N_DUCTNODES
    DN=>DUCTNODE(NE%NODE_INDEX(NN))
    IF (DN%VENT .OR. DN%AMBIENT .OR. DN%LEAKAGE .OR. DN%GEOM) CYCLE

Source/init.f90

@@ -996,6 +996,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_2(NM)
 USE MEMORY_FUNCTIONS, ONLY: REALLOCATE_EDGE,REALLOCATE_REAL_ARRAY
 USE PHYSICAL_FUNCTIONS, ONLY: GET_SPECIFIC_HEAT
 USE CONTROL_VARIABLES
+USE MISC_FUNCTIONS, ONLY: DEFINE_PRES_METHOD
 INTEGER :: N,I,J,K,IPTS,JPTS,KPTS,N_EDGES_DIM,IW,IC,IERR,IPZ,IZERO,ICF,NSLICE
 INTEGER, INTENT(IN) :: NM
 REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES),VC,RTRM,CP
@@ -1125,6 +1126,17 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_2(NM)
    B1%PRESSURE_ZONE = M%PRESSURE_ZONE(BC%IIG,BC%JJG,BC%KKG)
 ENDDO CFACE_LOOP_0
 
+! For CC_IBM and unspecified pressure solver, select Pressure solver
+! with number of pressure zones:
+IF(CC_IBM .AND. PERIODIC_TEST/=7) THEN
+   IF (PRES_FLAG/=UGLMAT_FLAG .AND. N_ZONE>1) THEN
+      PRES_METHOD = 'ULMAT'
+   ELSEIF (PRES_FLAG/=ULMAT_FLAG .AND. N_ZONE<=1) THEN
+      PRES_METHOD = 'UGLMAT'
+   ENDIF
+   CALL DEFINE_PRES_METHOD(PRES_METHOD)
+ENDIF
+
 ! If there is complex terrain using GEOM and Above Ground Level (AGL) slices,
 ! determine K index of gas phase quantities.