Fix readgridncsize merge issue

CyprienBosserelle · Oct 6, 2023 · ab8ee29 · ab8ee29
1 parent 25baa6c
commit ab8ee29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Read_netcdf.cu b/src/Read_netcdf.cu
@@ -80,7 +80,7 @@ inline int nc_get_var1_T(int ncid, int varid, const size_t* startp, double * zsa
 
 //void readgridncsize(const std::string ncfilestr, const std::string varstr, int &nx, int &ny, int &nt, double &dx, double &xo, double &yo, double &to, double &xmax, double &ymax, double &tmax, bool & flipx, bool & flipy)
 //void readgridncsize(forcingmap &Fmap, Param XParam)
-void readgridncsize(const std::string ncfilestr, const std::string varstr, std::string reftime, int& nx, int& ny, int& nt, double& dx, double& dt, double& xo, double& yo, double& to, double& xmax, double& ymax, double& tmax, bool& flipx, bool& flipy)
+void readgridncsize(const std::string ncfilestr, const std::string varstr, std::string reftime, int& nx, int& ny, int& nt, double& dx, double& dy, double& dt, double& xo, double& yo, double& to, double& xmax, double& ymax, double& tmax, bool& flipx, bool& flipy)
 {
 	//std::string ncfilestr = Fmap.inputfile;
 	//std::string varstr = Fmap.varname;
@@ -325,15 +325,15 @@ void readgridncsize(const std::string ncfilestr, const std::string varstr, std::
 void readgridncsize(forcingmap& Fmap, Param XParam)
 {
 
-	readgridncsize(Fmap.inputfile, Fmap.varname, XParam.reftime, Fmap.nx, Fmap.ny, Fmap.nt, Fmap.dx, Fmap.dt, Fmap.xo, Fmap.yo, Fmap.to, Fmap.xmax, Fmap.ymax, Fmap.tmax, Fmap.flipxx, Fmap.flipyy);
+	readgridncsize(Fmap.inputfile, Fmap.varname, XParam.reftime, Fmap.nx, Fmap.ny, Fmap.nt, Fmap.dx, Fmap.dy, Fmap.dt, Fmap.xo, Fmap.yo, Fmap.to, Fmap.xmax, Fmap.ymax, Fmap.tmax, Fmap.flipxx, Fmap.flipyy);
 }
 
 
 template<class T> void readgridncsize(T& Imap)
 {
 	double a, b, c;
 	int duma, dumb, dumc;
-	readgridncsize(Imap.inputfile, Imap.varname, "2000-01-01T00:00:00", Imap.nx, Imap.ny, duma, Imap.dx, a, Imap.xo, Imap.yo, b, Imap.xmax, Imap.ymax, c, Imap.flipxx, Imap.flipyy);
+	readgridncsize(Imap.inputfile, Imap.varname, "2000-01-01T00:00:00", Imap.nx, Imap.ny, duma, Imap.dx, Imap.dy, a, Imap.xo, Imap.yo, b, Imap.xmax, Imap.ymax, c, Imap.flipxx, Imap.flipyy);
 }
 template void readgridncsize<inputmap>(inputmap &Imap);
 template void readgridncsize<forcingmap>(forcingmap &Imap);

diff --git a/src/Read_netcdf.h b/src/Read_netcdf.h
@@ -29,7 +29,7 @@ inline int nc_get_var1_T(int ncid, int varid, const size_t* startp, double * zsa
 std::string checkncvarname(int ncid, std::string stringA, std::string stringB, std::string stringC, std::string stringD, std::string stringE);
 
 
-void readgridncsize(const std::string ncfilestr, const std::string varstr, int& nx, int& ny, int& nt, double& dx, double& dt, double& xo, double& yo, double& to, double& xmax, double& ymax, double& tmax, bool& flipx, bool& flipy);
+void readgridncsize(const std::string ncfilestr, const std::string varstr, std::string reftime, int& nx, int& ny, int& nt, double& dx, double& dy, double& dt, double& xo, double& yo, double& to, double& xmax, double& ymax, double& tmax, bool& flipx, bool& flipy);
 void readgridncsize(forcingmap& Fmap, Param XParam);
 
 template<class T> void readgridncsize(T& Imap);