add ignore

NightIsDark
1 parent e15ffb12
Showing 6 changed files with 17 additions and 8 deletions
.gitignore
CMakeLists.txt
cal_gate.c
cal_gate.h
test
test.c → test-hdsmf/test.c
+CMakeLists.txt
+
+
+foreach(incdir ${APP_INCDIRS})
+    include_directories(${incdir})
+endforeach()
+
+aux_source_directory(. DIR_SRCS)
+add_library(Stage-Discharge-Relation ${CMAKE_LIB_TYPE} ${DIR_SRCS})
+
+#add_subdirectory("test-hdsmf")
+
@@ -471,14 +471,14 @@ double Calculation_of_InstantaneousFlow(double openning_height_of_gate, double w
 //double openning_height_of_gate, double water_depth_front_of_gate,double water_depth_behind_of_gate,double gate_width,int wingwall,int drop_step
-double Calculation_of_InstantaneousFlow(struct param_gate *param)
+int Calculation_of_InstantaneousFlow(double *value,struct param_gate *param)
 {
 	patterns_of_water get_pattern;
 	double temp;
 	if(data_validity_check(param)!=0)
-		return 0;
+		return -1;
 	get_pattern = discrimination_of_flow_pattern(param->openning_height_of_gate,param->water_depth_front_of_gate,param->water_depth_behind_of_gate,param->drop_step);
 	switch(get_pattern){
@@ -511,7 +511,8 @@ double Calculation_of_InstantaneousFlow(struct param_gate *param)
 				param->openning_height_of_gate,param->gate_width,param->wingwall,param->drop_step);
 		break;
 	}
-	return temp;
+	*value =	temp;
+	return 0;
 }
@@ -12,10 +12,6 @@ struct param_gate{
 	double gate_width;
 };
-
-//double Calculation_of_InstantaneousFlow(double openning_height_of_gate, double water_depth_front_of_gate,double water_depth_behind_of_gate,double gate_width,int wingwall,int drop_step);
-double Calculation_of_InstantaneousFlow(struct param_gate *param);
-
-
+int Calculation_of_InstantaneousFlow(double * value,struct param_gate *param);
 #endif