diff --git a/matlab/gatdaem1d_functions/gatdaem1d_forwardmodel.m b/matlab/gatdaem1d_functions/gatdaem1d_forwardmodel.m index a73bbf6..89069d3 100644 --- a/matlab/gatdaem1d_functions/gatdaem1d_forwardmodel.m +++ b/matlab/gatdaem1d_functions/gatdaem1d_forwardmodel.m @@ -11,26 +11,27 @@ nlayers=length(E.conductivity); if(nlayers ~= 1+length(E.thickness)) - error('Sorry the size of thicknesses must be one less than the size of conductivity');; + error('Sorry the length of thicknesses must be one less than the length of conductivity');; end if(nargin == 4) if(strcmpi(iptypestr,'colecole')) - iptype=0; - elseif(strcmpi(iptypestr,'pelton')) iptype=1; + elseif(strcmpi(iptypestr,'pelton')) + iptype=2; else - error('Sorry iptypestr must "colecole" or "pelton"'); + error('Sorry for IP modelling iptypestr must be either "colecole" or "pelton"'); end + if(isfield(E,'chargeability')) if(nlayers ~= length(E.chargeability)) - error('Sorry the size of chargeability must equal to the size of conductivity');; + error('Sorry the length of chargeability must equal to the length of conductivity');; end if(isfield(E,'timeconstant')) if(nlayers ~= length(E.timeconstant)) - error('Sorry the size of timeconstant must be equal to the size of conductivity');; + error('Sorry the length of timeconstant must be equal to the length of conductivity');; end else error('Sorry you must set the timeconstant');; @@ -38,7 +39,7 @@ if(isfield(E,'frequencydependence')) if(nlayers ~= length(E.frequencydependence)) - error('Sorry the size of frequencydependence must equal to the size of conductivity');; + error('Sorry the length of frequencydependence must equal to the length of conductivity');; end else error('Sorry you must set the frequencedependence');; diff --git a/python/setup.py b/python/setup.py index 1faa138..8f92a78 100644 --- a/python/setup.py +++ b/python/setup.py @@ -24,7 +24,7 @@ package_dir={'gatdaem1d':'gatdaem1d'}, package_data={'gatdaem1d':['gatdaem1d.so', 'gatdaem1d.dll']}, scripts=[], - version=2.0, + version='2.0.1', description='Time-domain airborne electromagnetic forward modelling.', long_description='Time-domain airborne electromagnetic forward modelling. Python interface to C++ library for forward model and derivative calculations for airborne electromagnetic (AEM) systems used in geophysics.', classifiers=[ diff --git a/src/ctlinedata2curtainimage.cpp b/src/ctlinedata2curtainimage.cpp index 4fc4da4..c1080de 100644 --- a/src/ctlinedata2curtainimage.cpp +++ b/src/ctlinedata2curtainimage.cpp @@ -924,11 +924,11 @@ int main(int argc, char** argv) cBlock sb = b.findblock("Section"); std::string headerfile; if (ib.getvalue("DfnFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n",headerfile.c_str()); + glog.logmsg("Headerfile = %s\n",headerfile.c_str()); glog.logmsg("Note: in future please use 'HeaderFile = ...' instead of 'DfnFile = ...'\n"); } else if (ib.getvalue("HeaderFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n", headerfile.c_str()); + glog.logmsg("Headerfile = %s\n", headerfile.c_str()); } else { glog.logmsg("No Headerfile defined, columns numbers to be used'\n"); @@ -960,7 +960,7 @@ int main(int argc, char** argv) } } - if (linefieldindex <= 0) { + if (linefieldindex < 0) { glog.logmsg("Error: cannot find the line field %s\n",linefieldname.c_str()); return 0; } diff --git a/src/ctlinedata2georefimage.cpp b/src/ctlinedata2georefimage.cpp index 99b99e6..29c95fc 100644 --- a/src/ctlinedata2georefimage.cpp +++ b/src/ctlinedata2georefimage.cpp @@ -569,14 +569,14 @@ int main(int argc, char** argv) cBlock sb = b.findblock("Section"); std::string headerfile; if (ib.getvalue("DfnFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n", headerfile.c_str()); + glog.logmsg("Headerfile = %s\n", headerfile.c_str()); glog.logmsg("Note: in future please use 'HeaderFile = ...' instead of 'DfnFile = ...'\n"); } else if (ib.getvalue("HeaderFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n", headerfile.c_str()); + glog.logmsg("Headerfile = %s\n", headerfile.c_str()); } else { - glog.logmsg("No Headerfile defined, columns numbers to be used'\n"); + glog.logmsg("No Headerfile defined, columns numbers to be used\n"); } int linefieldindex = -1; @@ -605,7 +605,7 @@ int main(int argc, char** argv) } } - if (linefieldindex <= 0) { + if (linefieldindex < 0) { glog.logmsg("Error: cannot find the line field %s\n", linefieldname.c_str()); return 0; } diff --git a/src/ctlinedata2sgrid.cpp b/src/ctlinedata2sgrid.cpp index e75c4f7..d95b0a5 100644 --- a/src/ctlinedata2sgrid.cpp +++ b/src/ctlinedata2sgrid.cpp @@ -469,11 +469,11 @@ int main(int argc, char** argv) std::string headerfile; if (ib.getvalue("DfnFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n", headerfile.c_str()); + glog.logmsg("Headerfile = %s\n", headerfile.c_str()); glog.logmsg("Note: in future please use 'HeaderFile = ...' instead of 'DfnFile = ...'\n"); } else if (ib.getvalue("HeaderFile", headerfile) == true) { - glog.logmsg("Headerfile = %s'\n", headerfile.c_str()); + glog.logmsg("Headerfile = %s\n", headerfile.c_str()); } else { glog.logmsg("No Headerfile defined, columns numbers to be used'\n"); @@ -505,7 +505,7 @@ int main(int argc, char** argv) } } - if (linefieldindex <= 0) { + if (linefieldindex < 0) { glog.logmsg("Error: cannot find the line field %s\n", linefieldname.c_str()); return 0; } diff --git a/src/ctlinedata2slicegrids.cpp b/src/ctlinedata2slicegrids.cpp index 3ded2d9..93a8534 100644 --- a/src/ctlinedata2slicegrids.cpp +++ b/src/ctlinedata2slicegrids.cpp @@ -267,11 +267,11 @@ class cSliceGridder { HeaderFile = undefinedvalue(); if (b.getvalue("DfnFile", HeaderFile) == true) { - glog.logmsg("Headerfile = %s'\n", HeaderFile.c_str()); + glog.logmsg("Headerfile = %s\n", HeaderFile.c_str()); glog.logmsg("Note: in future please use 'HeaderFile = ...' instead of 'DfnFile = ...'\n"); } else if (b.getvalue("HeaderFile", HeaderFile) == true) { - glog.logmsg("Headerfile = %s'\n", HeaderFile.c_str()); + glog.logmsg("Headerfile = %s\n", HeaderFile.c_str()); } else { glog.logmsg("No Headerfile defined, columns numbers to be used'\n"); diff --git a/src/gaaem_version.h b/src/gaaem_version.h index 44ac2ae..f95e9b6 100644 --- a/src/gaaem_version.h +++ b/src/gaaem_version.h @@ -9,6 +9,6 @@ Author: Ross C. Brodie, Geoscience Australia. #ifndef _gaaem_version_H #define _gaaem_version_H -constexpr auto GAAEM_VERSION = "v2.0.0-Release-20240424"; +constexpr auto GAAEM_VERSION = "v2.0.1-Release-20240619"; #endif diff --git a/visualstudio/ctlinedata2curtainimage/ctlinedata2curtainimage.sln b/visualstudio/ctlinedata2curtainimage/ctlinedata2curtainimage.sln index eab60ae..a2ca66d 100644 --- a/visualstudio/ctlinedata2curtainimage/ctlinedata2curtainimage.sln +++ b/visualstudio/ctlinedata2curtainimage/ctlinedata2curtainimage.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.31101.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctlinedata2curtainimage", "ctlinedata2curtainimage.vcxproj", "{F2C8E4EA-11EA-4AB5-9D36-624F29CE131D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctlinedata2curtainimage", "ctlinedata2curtainimage.vcxproj", "{C63C0B65-EB12-41CF-A77C-C3EE5B3C7560}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F2C8E4EA-11EA-4AB5-9D36-624F29CE131D}.Debug|x64.ActiveCfg = Debug|x64 - {F2C8E4EA-11EA-4AB5-9D36-624F29CE131D}.Debug|x64.Build.0 = Debug|x64 - {F2C8E4EA-11EA-4AB5-9D36-624F29CE131D}.Release|x64.ActiveCfg = Release|x64 - {F2C8E4EA-11EA-4AB5-9D36-624F29CE131D}.Release|x64.Build.0 = Release|x64 + {C63C0B65-EB12-41CF-A77C-C3EE5B3C7560}.Debug|x64.ActiveCfg = Debug|x64 + {C63C0B65-EB12-41CF-A77C-C3EE5B3C7560}.Debug|x64.Build.0 = Debug|x64 + {C63C0B65-EB12-41CF-A77C-C3EE5B3C7560}.Release|x64.ActiveCfg = Release|x64 + {C63C0B65-EB12-41CF-A77C-C3EE5B3C7560}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE