utfile
This commit is contained in:
		
							
								
								
									
										36
									
								
								src/main.c
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								src/main.c
									
									
									
									
									
								
							@@ -60,7 +60,7 @@ int print_usage();
 | 
			
		||||
int print_params(nstrophy_parameters parameters, char* initfile_str, char* drivingfile_str, FILE* file);
 | 
			
		||||
 | 
			
		||||
// read command line arguments
 | 
			
		||||
int read_args(int argc, const char* argv[], char** params, unsigned int* command, unsigned int* nthreads, char** savefile_str);
 | 
			
		||||
int read_args(int argc, const char* argv[], char** params, unsigned int* command, unsigned int* nthreads, char** savefile_str, char** utfile_str);
 | 
			
		||||
int read_params(char* param_str, nstrophy_parameters* parameters, char** initfile_str, char** drivingfile_str);
 | 
			
		||||
int set_parameter(char* lhs, char* rhs, nstrophy_parameters* parameters, bool* setN1, bool* setN2, char** initfile_str, char** drivingfile_str);
 | 
			
		||||
 | 
			
		||||
@@ -94,14 +94,16 @@ int main (
 | 
			
		||||
  _Complex double* u0;
 | 
			
		||||
  _Complex double *g;
 | 
			
		||||
  char* savefile_str=NULL;
 | 
			
		||||
  char* utfile_str=NULL;
 | 
			
		||||
  char* initfile_str=NULL;
 | 
			
		||||
  char* drivingfile_str=NULL;
 | 
			
		||||
  FILE* savefile=NULL;
 | 
			
		||||
  FILE* utfile=NULL;
 | 
			
		||||
 | 
			
		||||
  command=0;
 | 
			
		||||
 | 
			
		||||
  // read command line arguments
 | 
			
		||||
  ret=read_args(argc, argv, ¶m_str, &command, &nthreads, &savefile_str);
 | 
			
		||||
  ret=read_args(argc, argv, ¶m_str, &command, &nthreads, &savefile_str, &utfile_str);
 | 
			
		||||
  if(ret<0){
 | 
			
		||||
    return(-1);
 | 
			
		||||
  }
 | 
			
		||||
@@ -152,6 +154,15 @@ int main (
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // open utfile (do this after closing init file)
 | 
			
		||||
  if(utfile_str!=NULL){
 | 
			
		||||
    utfile=fopen(utfile_str,"w");
 | 
			
		||||
    if(utfile==NULL){
 | 
			
		||||
      fprintf(stderr,"Error opening file '%s' for writing: %s\n", utfile_str, strerror(errno));
 | 
			
		||||
      return(-1);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // print parameters
 | 
			
		||||
  print_params(parameters, initfile_str, drivingfile_str, stderr);
 | 
			
		||||
  print_params(parameters, initfile_str, drivingfile_str, stdout);
 | 
			
		||||
@@ -173,7 +184,7 @@ int main (
 | 
			
		||||
    // register signal handler to handle aborts
 | 
			
		||||
    signal(SIGINT, sig_handler);
 | 
			
		||||
    signal(SIGTERM, sig_handler);
 | 
			
		||||
    enstrophy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, u0, g, parameters.irreversible, parameters.algorithm, parameters.print_freq, parameters.starting_time, nthreads, savefile, (char*)argv[0], param_str, savefile_str);
 | 
			
		||||
    enstrophy(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, u0, g, parameters.irreversible, parameters.algorithm, parameters.print_freq, parameters.starting_time, nthreads, savefile, utfile, (char*)argv[0], param_str, savefile_str);
 | 
			
		||||
  }
 | 
			
		||||
  else if(command==COMMAND_QUIET){
 | 
			
		||||
    quiet(parameters.K1, parameters.K2, parameters.N1, parameters.N2, parameters.final_time, parameters.nu, parameters.delta, parameters.L, parameters.adaptive_tolerance, parameters.adaptive_factor, parameters.max_delta, parameters.adaptive_norm, parameters.starting_time, u0, g, parameters.irreversible, parameters.algorithm, nthreads, savefile);
 | 
			
		||||
@@ -191,12 +202,17 @@ int main (
 | 
			
		||||
    fclose(savefile);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // close utfile
 | 
			
		||||
  if (utfile!=NULL){
 | 
			
		||||
    fclose(utfile);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return(0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// usage message
 | 
			
		||||
int print_usage(){
 | 
			
		||||
  fprintf(stderr, "usage:\n       nstrophy [-t nthreads] [-p parameters] [-s savefile] <command>\n\n");
 | 
			
		||||
  fprintf(stderr, "usage:\n       nstrophy [-t nthreads] [-p parameters] [-s savefile] [-u u_outfile] <command>\n\n");
 | 
			
		||||
  return(0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -301,13 +317,15 @@ int print_params(
 | 
			
		||||
#define CP_FLAG_PARAMS 1
 | 
			
		||||
#define CP_FLAG_NTHREADS 2
 | 
			
		||||
#define CP_FLAG_SAVEFILE 3
 | 
			
		||||
#define CP_FLAG_UTFILE 4
 | 
			
		||||
int read_args(
 | 
			
		||||
  int argc,
 | 
			
		||||
  const char* argv[],
 | 
			
		||||
  char** params,
 | 
			
		||||
  unsigned int* command,
 | 
			
		||||
  unsigned int* nthreads,
 | 
			
		||||
  char** savefile_str
 | 
			
		||||
  char** savefile_str,
 | 
			
		||||
  char** utfile_str
 | 
			
		||||
){
 | 
			
		||||
  int i;
 | 
			
		||||
  int ret;
 | 
			
		||||
@@ -331,6 +349,9 @@ int read_args(
 | 
			
		||||
	case 's':
 | 
			
		||||
	  flag=CP_FLAG_SAVEFILE;
 | 
			
		||||
	  break;
 | 
			
		||||
	case 'u':
 | 
			
		||||
	  flag=CP_FLAG_UTFILE;
 | 
			
		||||
	  break;
 | 
			
		||||
	default:
 | 
			
		||||
	  fprintf(stderr, "unrecognized option '-%c'\n", *ptr);
 | 
			
		||||
	  print_usage();
 | 
			
		||||
@@ -358,6 +379,11 @@ int read_args(
 | 
			
		||||
      *savefile_str=(char*)argv[i];
 | 
			
		||||
      flag=0;
 | 
			
		||||
    }
 | 
			
		||||
    // savefile
 | 
			
		||||
    else if(flag==CP_FLAG_UTFILE){
 | 
			
		||||
      *utfile_str=(char*)argv[i];
 | 
			
		||||
      flag=0;
 | 
			
		||||
    }
 | 
			
		||||
    // computation to run
 | 
			
		||||
    else{
 | 
			
		||||
      if(strcmp(argv[i], "uk")==0){
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user