Merge pull request #92 from scharlton2/develop_v4-issue-25-2013

started branch to demonstrate issue-25 from i-RIC/iriclib_v4

Author: kskinoue0612

unittests_cgnsfile/CMakeLists.txt

@@ -9,6 +9,8 @@ configure_file(case_read_adf.cgn case_read_adf.cgn COPYONLY)
 configure_file(case_read_hdf5.cgn case_read_hdf5.cgn COPYONLY)
 configure_file(case_read_adf_no_sols.cgn case_read_adf_no_sols.cgn COPYONLY)
 configure_file(case_read_hdf5_no_sols.cgn case_read_hdf5_no_sols.cgn COPYONLY)
+configure_file(case_init_fm.cgn case_init_fm.cgn COPYONLY)
+configure_file(case_init_fm_3d.cgn case_init_fm_3d.cgn COPYONLY)
 
 find_package(HDF5 1.8 REQUIRED)
 

unittests_cgnsfile/case_grid.cpp

@@ -113,6 +113,56 @@ void case_GridRead()
 	remove("case_grid.cgn");
 }
 
+void case_GridRead_FaSTMECH()
+{
+	// fastmech ex3 with no results
+	fs::copy("case_init_fm.cgn", "case_fm.cgn");
+
+	int fid;
+	int ier = cg_open("case_fm.cgn", CG_MODE_MODIFY, &fid);
+	VERIFY_LOG("cg_iRIC_Open() ier == 0", ier == 0);
+	VERIFY_LOG("cg_iRIC_Open() fid != 0", fid != 0);
+
+	ier = cg_iRIC_Init(fid);
+	VERIFY_LOG("cg_iRIC_Init() ier == 0", ier == 0);
+
+	cgsize_t isize, jsize;
+	ier = cg_iRIC_GotoGridCoord2d_Mul(fid, &isize, &jsize);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() ier == 0", ier == 0);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() isize == 181", isize == 181);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() jsize == 81", jsize == 81);
+
+	ier = cg_close(fid);
+	VERIFY_LOG("cg_close() ier == 0", ier == 0);
+
+	remove("case_fm.cgn");
+}
+
+void case_GridRead_FaSTMECH_3d_results()
+{
+	// fastmech ex3 with 3d results
+	fs::copy("case_init_fm_3d.cgn", "case_fm_3d.cgn");
+
+	int fid;
+	int ier = cg_open("case_fm_3d.cgn", CG_MODE_MODIFY, &fid);
+	VERIFY_LOG("cg_open() ier == 0", ier == 0);
+	VERIFY_LOG("cg_open() fid != 0", fid != 0);
+
+	ier = cg_iRIC_Init(fid);
+	VERIFY_LOG("cg_iRIC_Init() ier == 0", ier == 0);
+
+	cgsize_t isize, jsize;
+	ier = cg_iRIC_GotoGridCoord2d_Mul(fid, &isize, &jsize);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() ier == 0", ier == 0);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() isize == 181", isize == 181);
+	VERIFY_LOG("cg_iRIC_GotoGridCoord2d_Mul() jsize == 81", jsize == 81);
+
+	ier = cg_close(fid);
+	VERIFY_LOG("cg_close() ier == 0", ier == 0);
+
+	remove("case_fm_3d.cgn");
+}
+
 void case_GridReadFunc()
 {
 	fs::copy("case_gridfunc.cgn", "case_gridreadfunc.cgn");

unittests_cgnsfile/case_init_fm.cgn

@@ -20,6 +20,8 @@ void case_BcWrite();
 void case_Complex();
 
 void case_GridRead();
+void case_GridRead_FaSTMECH();
+void case_GridRead_FaSTMECH_3d_results();
 void case_GridReadFunc();
 void case_GridWrite();
 

unittests_cgnsfile/case_init_fm_3d.cgn

@@ -28,6 +28,8 @@ int main(int argc, char* argv[])
 	case_Complex();
 
 	case_GridRead();
+	case_GridRead_FaSTMECH();
+	case_GridRead_FaSTMECH_3d_results();
 	case_GridReadFunc();
 	case_GridWrite();