Merge remote-tracking branch 'firemodels/master' into tpbuild

Author: cxp484

Build/makefile

@@ -147,6 +147,7 @@ setup_win:
 
 # Files which have OpenMP compiler directives are compiled using the FOPENMPFLAG and can be enabled/disabled on a per-file basis.
 
+ccib.o: FFLAGS += $(FOPENMPFLAGS)
 divg.o: FFLAGS += $(FOPENMPFLAGS)
 func.o: FFLAGS += $(FOPENMPFLAGS)
 mass.o: FFLAGS += $(FOPENMPFLAGS)
@@ -157,6 +158,7 @@ radi.o: FFLAGS += $(FOPENMPFLAGS)
 wall.o: FFLAGS += $(FOPENMPFLAGS)
 main.o: FFLAGS += $(FOPENMPFLAGS)
 
+ccib.obj: FFLAGS += $(FOPENMPFLAGS)
 divg.obj: FFLAGS += $(FOPENMPFLAGS)
 func.obj: FFLAGS += $(FOPENMPFLAGS)
 mass.obj: FFLAGS += $(FOPENMPFLAGS)

Source/mass.f90

@@ -532,7 +532,7 @@ SUBROUTINE DENSITY(T,DT,NM)
 
    !$OMP PARALLEL
 
-   !$OMP DO PRIVATE(IW,WC,BC)
+   !$OMP DO PRIVATE(IW,WC,EWC,BC)
    WALL_LOOP_2: DO IW=1,N_EXTERNAL_WALL_CELLS
       WC => WALL(IW)
       EWC => EXTERNAL_WALL(IW)