Index: branches/eam_branches/relphot.20210521/src/args.c
===================================================================
--- branches/eam_branches/relphot.20210521/src/args.c	(revision 41602)
+++ branches/eam_branches/relphot.20210521/src/args.c	(revision 41603)
@@ -198,11 +198,4 @@
   }
 
-  NGRID = 8;
-  if ((N = get_argument (argc, argv, "-ngrid"))) {
-    remove_argument (N, &argc, argv);
-    NGRID = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
   TEST_IMAGE1 = -1;
   if ((N = get_argument (argc, argv, "-test-image1"))) {
@@ -387,9 +380,10 @@
   }
 
-  // USE_GRID is not valid for all cases, probably should be its own mode...
-  USE_GRID = FALSE;
+  // GRID_ZEROPT is not valid for all cases, probably should be its own mode...
+  GRID_ZEROPT = FALSE;
   if ((N = get_argument (argc, argv, "-grid"))) {
     remove_argument (N, &argc, argv);
-    USE_GRID = TRUE;
+    GRID_ZEROPT = TRUE;
+    GRID_ZPT_MODE  = GRID_ZPT_MODE_NONE; // start with grid off
   }