Removed statements that printed file name.

Fixed errors of comments within comments in flare.c.
VirtualPlanetaryLaboratory · Oct 24, 2023 · 1cdc31a · 1cdc31a
1 parent b9277ff
commit 1cdc31a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 62 deletions.
diff --git a/src/flare.c b/src/flare.c
@@ -97,49 +97,6 @@ void ReadFlareFFD(BODY *body,
   } else if (iFile > 0)
     body[iFile - 1].iFlareFFD = FLARE_FFD_DAVENPORT;
 }
-/*
-void ReadFlareSlopeUnits(BODY *body,
-                         CONTROL *control,
-                         FILES *files,
-                         OPTIONS *options,
-                         SYSTEM *system,
-                         int iFile) {
-  /* This parameter cannot exist in primary file */
-/*int lTmp = -1;
-char cTmp[OPTLEN];
-
-AddOptionString(files->Infile[iFile].cIn,
-                options->cName,
-                cTmp,
-                &lTmp,
-                control->Io.iVerbose);
-if (lTmp >= 0) {
-  NotPrimaryInput(iFile,
-                  options->cName,
-                  files->Infile[iFile].cIn,
-                  lTmp,
-                  control->Io.iVerbose);
-  if (!memcmp(sLower(cTmp), "se", 2)) {
-    body[iFile - 1].iFlareSlopeUnits = FLARE_SLOPE_SEC;
-  } else if (!memcmp(sLower(cTmp), "mi", 2)) {
-    body[iFile - 1].iFlareSlopeUnits = FLARE_SLOPE_MINUTE;
-  } else if (!memcmp(sLower(cTmp), "ho", 2)) {
-    body[iFile - 1].iFlareSlopeUnits = FLARE_SLOPE_HOUR;
-  } else if (!memcmp(sLower(cTmp), "da", 2)) {
-    body[iFile - 1].iFlareSlopeUnits = FLARE_SLOPE_DAY;
-  } else {
-    if (control->Io.iVerbose >= VERBERR)
-      fprintf(stderr,
-              "ERROR: Unknown argument to %s: %s. Options are SEC, MIN, HOUR "
-              "or DAY.\n",
-              options->cName,
-              cTmp);
-    LineExit(files->Infile[iFile].cIn, lTmp);
-  }
-  UpdateFoundOption(&files->Infile[iFile], options, lTmp, iFile);
-} else if (iFile > 0)
-  body[iFile - 1].iFlareSlopeUnits = FLARE_SLOPE_DAY;
-}*/
 
 void ReadFlareBandPass(BODY *body,
                        CONTROL *control,
@@ -1018,8 +975,8 @@ void FinalizeUpdateLXUVFlare(BODY *body, UPDATE *update, int *iEqn, int iVar,
 // not need this.
 /*void FinalizeUpdateFlareFreqMax(BODY *body, UPDATE *update, int *iEqn, int
   iVar, int iBody, int iFoo) {
-  /* No primary variables for FLARE yet*/
-/*  update[iBody].iaModule[iVar][*iEqn] = FLARE;
+  // No primary variables for FLARE yet
+  //  update[iBody].iaModule[iVar][*iEqn] = FLARE;
   update[iBody].iNumFlareFreqMax              = (*iEqn)++;
 }
 */

diff --git a/src/options.c b/src/options.c
@@ -436,18 +436,14 @@ int iGetNumLines(char cFile[]) {
   FILE *fp;
   char cLine[LINE];
 
-  fprintf(stderr,"File: %s\n",cFile);
-
   fp = fopen(cFile, "r");
   if (fp == NULL) {
     fprintf(stderr, "Unable to open %s.\n", cFile);
     exit(EXIT_INPUT);
   }
 
   memset(cLine, '\0', LINE);
-  // fprintf(stderr,"File: %s\n",cFile);
   while (fgets(cLine, LINE, fp) != NULL) {
-    // fprintf(stderr,"iLine: %d, %s",iNumLines,cLine);
     iNumLines++;
 
     /* Check to see if line is too long. The maximum length of a line is set
@@ -489,8 +485,6 @@ void InitializeInput(INFILE *input) {
   FILE *fp;
   char cLine[LINE];
 
-fprintf(stderr,"File: %s\n",input->cIn);
-
   fp = fopen(input->cIn, "r");
   if (fp == NULL) {
     fprintf(stderr, "Unable to open %s.\n", input->cIn);
@@ -503,23 +497,12 @@ fprintf(stderr,"File: %s\n",input->cIn);
   input->cReactions[0] = 0;
   */
 
-  // fprintf(stderr,"File: %s\n",input->cIn);
   for (iLine = 0; iLine < input->iNumLines; iLine++) {
-    /* Initialize bLineOK */
     input->bLineOK[iLine] = 0;
-
-    /* Now find those lines that are comments or blank
-    for (iPos = 0; iPos < LINE; iPos++) {
-      cLine[iPos] = '\0';
-    }
-    */
     memset(cLine, '\0', LINE);
 
     fgets(cLine, LINE, fp);
-    // fprintf(stderr,"iLine: %d, %s",iLine,cLine);
-    /* Check for # sign or blank line */
     if (CheckComment(cLine, LINE)) {
-      /* Line is OK */
       input->bLineOK[iLine] = 1;
     } else {
       // Is it a blank line?