Code now compiles and one test simulation passes!

src/control.c

@@ -1063,7 +1063,7 @@ void fsUnitsAngMom(UNITS *units, char **cUnit) {
   // strcat(cUnit, "^2/");
   // fsUnitsTime(units->iTime, cTmp);
   // strcat(cUnit, cTmp);
-  fvFormattedString(cUnit, cUnitMass, "*", cUnitLength, "^2/", cUnitTime);
+  fvFormattedString(cUnit, "%s*%s^2/%s", cUnitMass, cUnitLength, cUnitTime);
   free(cUnitMass);
   free(cUnitLength);
   free(cUnitTime);
@@ -1079,7 +1079,7 @@ void fsUnitsDensity(UNITS *units, char **cUnit) {
   // strcat(cUnit, "^3");
   fsUnitsMass(units->iMass, &cUnitMass);
   fsUnitsLength(units->iLength, &cUnitLength);
-  fvFormattedString(cUnit, cUnitMass, "/", cUnitLength, "^3");
+  fvFormattedString(cUnit, "%s/%s^3",cUnitMass, cUnitLength);
   free(cUnitMass);
   free(cUnitLength);
 }
@@ -1093,7 +1093,7 @@ void fsUnitsVel(UNITS *units, char **cUnit) {
   // strcat(cUnit, cTmp);
   fsUnitsLength(units->iLength, &cUnitLength);
   fsUnitsTime(units->iTime, &cUnitTime);
-  fvFormattedString(cUnit, cUnitLength, "/", cUnitTime);
+  fvFormattedString(cUnit, "%s/%s", cUnitLength, cUnitTime);
   free(cUnitTime);
   free(cUnitLength);
 }
@@ -1105,7 +1105,7 @@ void fsUnitsRate(int iType, char **cUnit) {
   // fsUnitsTime(iType, cTmp);
   // strcat(cUnit, cTmp);
   fsUnitsTime(iType, &cUnitTime);
-  fvFormattedString(cUnit, "/", cUnitTime);
+  fvFormattedString(cUnit, "/%s", cUnitTime);
   free(cUnitTime);
 }
 
@@ -1116,7 +1116,7 @@ void fsUnitsRateSquared(int iType, char **cUnit) {
   // fsUnitsTime(iType, cTmp);
   // strcat(cUnit, cTmp);
   fsUnitsTime(iType, &cUnitTime);
-  fvFormattedString(cUnit, "/", cUnitTime, "^2");
+  fvFormattedString(cUnit, "/%s^2", cUnitTime);
   free(cUnitTime);
 }
 
@@ -1134,7 +1134,7 @@ void fsUnitsAngRate(UNITS *units, char **cUnit) {
   // strcat(cUnit, cTmp);
   fsUnitsAngle(units->iAngle, &cUnitAngle);
   fsUnitsTime(units->iTime, &cUnitTime);
-  fvFormattedString(cUnit, cUnitAngle, "/", cUnitTime);
+  fvFormattedString(cUnit, "%s/%s", cUnitAngle, cUnitTime);
   free(cUnitTime);
   free(cUnitAngle);
 }
@@ -1154,7 +1154,7 @@ void fsUnitsEnergy(UNITS *units, char **cUnit) {
   // fsUnitsTime(units->iTime, cTmp);
   // strcat(cUnit, cTmp);
   // strcat(cUnit, "^2");
-  fvFormattedString(cUnit, cUnitMass, "*", cUnitLength, "^2/", cUnitTime, "^2");
+  fvFormattedString(cUnit, "%s*%s^2/%s^2", cUnitMass, cUnitLength, cUnitTime);
   free(cUnitMass);
   free(cUnitLength);
   free(cUnitTime);
@@ -1182,7 +1182,7 @@ void fsUnitsPower(UNITS *units, char **cUnit) {
   // fsUnitsTime(units->iTime, cTmp);
   // strcat(cUnit, cTmp);
   // strcat(cUnit, "^3");
-  fvFormattedString(cUnit, cUnitMass, "*", cUnitLength, "^2/", cUnitTime, "^3");
+  fvFormattedString(cUnit, "%s*%s^2/%s^3", cUnitMass, cUnitLength, cUnitTime);
   free(cUnitMass);
   free(cUnitLength);
   free(cUnitTime);
@@ -1208,7 +1208,7 @@ void fsUnitsEnergyFlux(UNITS *units, char **cUnit) {
   // fsUnitsTime(units->iTime, cTmp);
   // strcat(cUnit, cTmp);
   // strcat(cUnit, ")");
-  fvFormattedString(cUnit, cUnitMass, "/", cUnitTime, "^3");
+  fvFormattedString(cUnit, "%s/%s^3", cUnitMass, cUnitTime);
 }
 
 double fdUnitsEnergyFlux(int iTime, int iMass, int iLength) {

src/options.c

@@ -251,7 +251,7 @@ double dNegativeDouble(OPTIONS options, char cFile[], int iVerbose) {
 void AddOptionStringArray(char *cFile, char *cOption, char ***saInput,
                           int *iNumIndices, int *iNumLines, int *iLine,
                           int iVerbose) {
-  char *cLine, cTmp[MAXARRAY][OPTLEN];
+  char *cLine, cTmp[MAXARRAY][OPTLEN], **saInputCopy;
   int iPos, iWord, bContinue, iNumWords;
   FILE *fp;
 
@@ -270,13 +270,18 @@ void AddOptionStringArray(char *cFile, char *cOption, char ***saInput,
   GetLine(cFile, cOption, &cLine, &iLine[0], iVerbose);
   GetWords(cLine, cTmp, &iNumWords, &bContinue);
   *iNumLines = 1;
-  *saInput   = malloc(MAXARRAY * sizeof(char *));
+  *saInput   = (char **)malloc((iNumWords-1) * sizeof(char *));
+
+  for (iWord = 0; iWord < iNumWords - 1; iWord++) {
+    (*saInput)[iWord] = NULL;
+  }
+  saInputCopy = *saInput;
 
   for (iWord = 0; iWord < iNumWords - 1; iWord++) {
-    *saInput[iWord] = NULL;
     // memset(saInput[iWord], '\0', OPTLEN);
 
-    fvFormattedString(saInput[iWord], cTmp[iWord + 1]);
+    //fvFormattedString(saInput[iWord], cTmp[iWord + 1]);
+    fvFormattedString(&saInputCopy[iWord], cTmp[iWord + 1]);
     /* Reset cTmp string: If the next time cTmp is filled, the
        new string is longer than the old, then vestigial characters
        can remain after a trailing $. */
@@ -1116,7 +1121,6 @@ void ReadSystemName(CONTROL *control, FILES *files, OPTIONS *options,
   int lTmp = -1;
   char cTmp[OPTLEN];
 
-  system->cName = NULL;
   AddOptionString(files->Infile[iFile].cIn, options->cName, cTmp, &lTmp,
                   control->Io.iVerbose);
   if (lTmp >= 0) {

src/output.c

@@ -2008,9 +2008,9 @@ void LogOutputOrder(BODY *body, CONTROL *control, FILES *files, OUTPUT *output,
                     SYSTEM *system, UPDATE *update, fnWriteOutput fnWrite[],
                     FILE *fp, int iBody) {
   int iCol, iOut, iSubOut, iExtra = 0;
-  char **cCol; // +2 for brackets
+  char **cCol; 
   double *dTmp;
-  char *cUnit=NULL, *cTmp;
+  char *cUnit=NULL, *cTmp=NULL;
 
   cCol=malloc(MODULEOUTEND*sizeof(char*));
   for (iCol = 0; iCol < files->Outfile[iBody].iNumCols; iCol++) {
@@ -2172,7 +2172,7 @@ void LogBody(BODY *body, CONTROL *control, FILES *files, MODULE *module,
 void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module,
               OPTIONS *options, OUTPUT *output, SYSTEM *system, UPDATE *update,
               fnUpdateVariable ***fnUpdate, fnWriteOutput fnWrite[], int iEnd) {
-  char *cTime;
+  char *cTime=NULL;
   FILE *fp;
   double dTotTime;
 

src/vplanet.c

@@ -73,6 +73,8 @@ int main_impl(int argc, char *argv[]) {
   fvFormattedString(&control.sGitVersion, "Unknown");
 #endif
 
+  system.cName=NULL;
+
   /** Must initialize all options and outputs for all modules
      independent of what is selected. This allows a complete
      help screen as well as checks during ReadOptions. This