Culverts

Makefile

@@ -232,7 +232,7 @@ ifeq ($(SAMPLE_ENABLED),0)
 EXEC ?= @echo "[@]"
 endif
 
-OBJ = BG_Flood.o AdaptCriteria.o Adaptation.o Advection.o  Boundary.o ConserveElevation.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o utctime.o Write_txtlog.o
+OBJ = BG_Flood.o AdaptCriteria.o Adaptation.o Advection.o  Boundary.o ConserveElevation.o Culverts.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o utctime.o Write_txtlog.o
 
 
 ################################################################################
@@ -268,6 +268,9 @@ Boundary.o:./src/Boundary.cu
 ConserveElevation.o:./src/ConserveElevation.cu
 	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
 
+Culverts.o:./src/Culverts.cu
+	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
+
 FlowCPU.o:./src/FlowCPU.cu
 	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
 
@@ -348,7 +351,7 @@ Spherical.o:./src/Spherical.cu
 utctime.o:./src/utctime.cu
 	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
 
-BG_Flood: BG_Flood.o AdaptCriteria.o Adaptation.o Advection.o Boundary.o ConserveElevation.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o Write_txtlog.o Poly.o Spherical.o utctime.o
+BG_Flood: BG_Flood.o AdaptCriteria.o Adaptation.o Advection.o Boundary.o ConserveElevation.o Culverts.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o Write_txtlog.o Poly.o Spherical.o utctime.o
 
 	$(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES)
 	$(EXEC) mkdir -p ../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)
@@ -359,7 +362,7 @@ run: build
 
 clean:
 
-	rm -f BG_Flood AdaptCriteria.o Adaptation.o Advection.o BG_Flood.o Boundary.o ConserveElevation.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o Write_txtlog.o Poly.o Spherical.o utctime.o
+	rm -f BG_Flood AdaptCriteria.o Adaptation.o Advection.o BG_Flood.o Boundary.o ConserveElevation.o Culverts.o FlowCPU.o FlowGPU.o Friction.o Gradients.o GridManip.o Halo.o InitEvolv.o InitialConditions.o Kurganov.o Mainloop.o Meanmax.o MemManagement.o Mesh.o ReadForcing.o ReadInput.o Read_netcdf.o Reimann.o Setup_GPU.o Testing.o Updateforcing.o Util_CPU.o Write_netcdf.o Write_txtlog.o Poly.o Spherical.o utctime.o
 
 	rm -rf ../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/template
 

src/Arrays.h

@@ -128,9 +128,10 @@ struct AdaptP
 
 struct BndblockP
 {
-	int nblkriver, nblkTs, nbndblkleft, nbndblkright, nbndblktop, nbndblkbot;
+	int nblkriver, nblkculvert, nblkTs, nbndblkleft, nbndblkright, nbndblktop, nbndblkbot;
 	int* river;
 	int* Tsout;
+	int* culvert;
 	//int * DrainSink;
 	//int * DrainSource;
 	//int * Bridges;
@@ -147,10 +148,6 @@ struct BndblockP
 
 
 
-
-
-
-
 template <class T>
 struct TimeP
 {
@@ -160,6 +157,21 @@ struct TimeP
 	T* arrmax, *arrmin;
 };
 
+
+template <class T>
+struct CulvertF
+{
+	T* zs1;
+	T* zs2;
+	T* h1;
+	T* h2;
+	T* dq; //positive if frow from P1 toward P2
+	int* type;
+	double* Qmax;
+	double* dx1;
+};
+
+
 template <class T>
 struct Model
 {
@@ -169,6 +181,9 @@ struct Model
 	GradientsP<T> grad;
 	FluxP<T> flux;
 	AdvanceP<T> adv;
+
+	//Culverts
+	CulvertF<T> culvertsF;
 
 	//external forcing
 	T* zb;

src/BG_Flood.cu

@@ -131,6 +131,7 @@ template < class T > int mainwork(Param XParam, Forcing<float> XForcing, Model<T
 	SetupGPU(XParam, XModel,XForcing, XModel_g);
 
 
+
 	//
 	log("\nModel setup complete");
 	log("#################################");
@@ -144,6 +145,7 @@ template < class T > int mainwork(Param XParam, Forcing<float> XForcing, Model<T
 	{
 		//============================================
 		// MainLoop
+		printf("XCulvertsF h1=%f\n", XModel.culvertsF.h1[0]);
 		MainLoop(XParam, XForcing, XModel, XModel_g);
 	}
 	else