From 8b6116e6ae71309f8132007d399e287c880cbd22 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Tue, 31 Mar 2026 13:02:02 -0600 Subject: [PATCH] I modified gctp(). It now has many const params. --- .vscode/jhrg/settings.json | 1 + .../gctp/include/gctp_prototypes.h | 2 +- modules/hdf5_handler/gctp/src/gctp.c | 27 +++++++++---------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json index 9ec8ed642f..70bd651548 100644 --- a/.vscode/jhrg/settings.json +++ b/.vscode/jhrg/settings.json @@ -19,6 +19,7 @@ "${workspaceFolder}/standalone/**", "${workspaceFolder}/xmlcommand/**", "${workspaceFolder}/modules/**", + "${workspaceFolder}/modules/hdf5_handler/gtcp/include/**" ], "C_Cpp.default.cppStandard": "c++14", "C_Cpp.default.intelliSenseMode": "macos-clang-arm64", diff --git a/modules/hdf5_handler/gctp/include/gctp_prototypes.h b/modules/hdf5_handler/gctp/include/gctp_prototypes.h index e95d5701a7..db16bd0a6d 100644 --- a/modules/hdf5_handler/gctp/include/gctp_prototypes.h +++ b/modules/hdf5_handler/gctp/include/gctp_prototypes.h @@ -286,7 +286,7 @@ long untfz(long inunit, long outunit, double *factor); int init(long ipr, long jpr, char *efile, char *pfile); void close_file(void); int hinv_init(int insys, int inzone, double *inparm, int indatum, char *fn27, char *fn83, int *iflg, int (*hinv_trans[])(double, double, double*, double*)); -int gctp(double *incoor, long *insys, long *inzone, double *inparm, long *inunit, long *indatum, long *ipr, char *efile, long *jpr, char *pfile, double *outcoor, long *outsys, long *outzone, double *outparm, long *outunit, long *outdatum, char *fn27, char *fn83, long *iflg); +int gctp(const double *incoor, const long *insys, const long *inzone, double *inparm, long *inunit, const long *indatum, const long *ipr, char *efile, const long *jpr, char *pfile, double *outcoor, const long *outsys, const long *outzone, double *outparm, long *outunit, const long *outdatum, char *fn27, char *fn83, long *iflg); int gctp_(double *incoor, long *insys, long *inzone, double *inparm, long *inunit, long *indatum, long *ipr, char *efile, long *jpr, char *pfile, double *outcoor, long *outsys, long *outzone, double *outparm, long *outunit, long *outdatum, char *fn27, char *fn83, long *iflg); #endif diff --git a/modules/hdf5_handler/gctp/src/gctp.c b/modules/hdf5_handler/gctp/src/gctp.c index 0f177dfcba..633d75c73d 100755 --- a/modules/hdf5_handler/gctp/src/gctp.c +++ b/modules/hdf5_handler/gctp/src/gctp.c @@ -36,6 +36,8 @@ ALGORITHM REFERENCES #define TRUE 1 #define FALSE 0 +double pakr2dm(double ang); /* defined in cproj.c jhrg 3/31/26*/ + static long iter = 0; /* First time flag */ static long inpj[MAXPROJ + 1]; /* input projection array */ static long indat[MAXPROJ + 1]; /* input dataum array */ @@ -71,31 +73,26 @@ static long NAD83[134] = {101,102,5010,5300,201,202,203,301,302,401,402,403, */ /* Added explicit return type. 6/5/23 */ -#if 0 -int -gctp(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,outcoor, - outsys,outzone,outparm,outunit,outdatum,fn27,fn83,iflg) -#endif int gctp( -double *incoor, /* input coordinates */ -long *insys, /* input projection code */ -long *inzone, /* input zone number */ +const double *incoor, /* input coordinates */ +const long *insys, /* input projection code */ +const long *inzone, /* input zone number */ double *inparm, /* input projection parameter array */ long *inunit, /* input units */ -long *indatum, /* input datum */ -long *ipr, /* printout flag for error messages. 0=screen, 1=file, +const long *indatum, /* input datum */ +const long *ipr, /* printout flag for error messages. 0=screen, 1=file, 2=both*/ char *efile, /* error file name */ -long *jpr, /* printout flag for projection parameters 0=screen, +const long *jpr, /* printout flag for projection parameters 0=screen, 1=file, 2 = both*/ char *pfile, /* error file name */ double *outcoor, /* output coordinates */ -long *outsys, /* output projection code */ -long *outzone, /* output zone */ +const long *outsys, /* output projection code */ +const long *outzone, /* output zone */ double *outparm, /* output projection array */ long *outunit, /* output units */ -long *outdatum, /* output datum */ +const long *outdatum, /* output datum */ char fn27[], /* file name of NAD 1927 parameter file */ char fn83[], /* file name of NAD 1983 parameter file */ long *iflg) /* error flag */ @@ -106,7 +103,7 @@ double factor; /* conversion factor */ double lon; /* longitude */ double lat; /* latitude */ /*double temp; */ /* dummy variable */ -double pakr2dm(double ang); +/* double pakr2dm(double ang); move declaration to top of file jhrg 3/31/26 */ long i,j; /* loop counters */ long ininit_flag; /* input initilization flag */ long outinit_flag; /* output initilization flag */