Hi Mathieu
I am running locally so I did not think two different versions would be a problem. When I check the status I get
...
C m/classes/clusters/computecanada.m
? m/classes/clusters/computecanada.m.mine
? m/classes/clusters/computecanada.m.r27664
? m/classes/clusters/computecanada.m.r28038
M m/classes/timesteppingadaptive.m
Summary of conflicts:
Text conflicts: 1
Looking at the computecanada.m file, I can see that the version I have locally and the version I have on the remote cluster are different. The only difference is in how email and mailtype are handled. The remote version has email and mailtype listed as properties:
properties (SetAccess=public)
% {{{
name = ''
login = '';
numtasks = 1;
cpuspertask = 8;
port = 0;
projectaccount = '';
codepath = '';
executionpath = '';
time = 24*60;
memory = 2;
email = '';
mailtype = '';
end
The local file does not have them under properties. Instead, it has them under the BuildQueueScript function:
`function BuildQueueScript(cluster,dirname,modelname,solution,io_gather,isvalgrind,isgprof,isdakota,isoceancoupling) % {{{
if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end
if(isgprof), disp('gprof not supported by cluster, ignoring...'); end
%write queuing script
fid=fopen([modelname '.queue'],'w');
fprintf(fid,'#!/bin/bash\n');
fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
fprintf(fid,'#SBATCH --account=%s \n',cluster.projectaccount);
fprintf(fid,'#SBATCH --ntasks=%i \n',cluster.numtasks);
fprintf(fid,'#SBATCH --cpus-per-task=%i\n',cluster.cpuspertask);
fprintf(fid,'#SBATCH --time=%i\n',cluster.time); %walltime is in minutes
fprintf(fid,'#SBATCH --mem-per-cpu=%igb\n',cluster.memory); %memory in in gigabytes
fprintf(fid,'#SBATCH --mail-user=%s\n',cluster.email); %email
fprintf(fid,'#SBATCH --mail-type=%s\n',cluster.mailtype);
fprintf(fid,'#SBATCH --output=%s.outlog \n',modelname);
fprintf(fid,'#SBATCH --error=%s.errlog \n\n',modelname);
fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
fprintf(fid,'srun %s/issm.exe %s %s %s\n',cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
if ~io_gather, %concatenate the output files:
fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
end
fclose(fid);
end %}}}`
I tried replacing the local file with the remote version, but it still resulted in the same error:
[1] ??? Error using ==> ./classes/Params/.././Params/IntParam.h:42
[1] GetParameterValue error message: Param ParametersSTART cannot return a bool