Changeset 25830
- Timestamp:
- 12/07/20 18:07:59 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/branches/trunk-larour-SLPS2020/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp
r25615 r25830 582 582 583 583 sprintf(fieldname,"%s%s",fields[f],"Histogram"); 584 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,1,nbins, j+1,0));584 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,1,nbins,steps[j],0)); 585 585 586 586 sprintf(fieldname,"%s%s",fields[f],"Max"); 587 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*maxxs[counter], j+1,0));587 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*maxxs[counter],steps[j],0)); 588 588 sprintf(fieldname,"%s%s",fields[f],"Min"); 589 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*minxs[counter], j+1,0));589 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*minxs[counter],steps[j],0)); 590 590 } 591 591 } … … 609 609 610 610 sprintf(fieldname,"%s%s",fields[f],"Histogram"); 611 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,size,nbins, j+1,0));611 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,size,nbins,steps[j],0)); 612 612 613 613 sprintf(fieldname,"%s%s",fields[f],"Max"); 614 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,maxxs[counter],size,1, j+1,0));614 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,maxxs[counter],size,1,steps[j],0)); 615 615 sprintf(fieldname,"%s%s",fields[f],"Min"); 616 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,minxs[counter],size,1, j+1,0));616 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,minxs[counter],size,1,steps[j],0)); 617 617 } 618 618 } … … 636 636 637 637 sprintf(fieldname,"%s%s",fields[f],"TimeMeanHistogram"); 638 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,1,nbins, 1,0));638 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,1,nbins,steps[0],0)); 639 639 640 640 sprintf(fieldname,"%s%s",fields[f],"TimeMeanMax"); 641 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*maxmeans[f], 1,0));641 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*maxmeans[f],steps[0],0)); 642 642 sprintf(fieldname,"%s%s",fields[f],"TimeMeaMin"); 643 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*minmeans[f], 1,0));643 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,*minmeans[f],steps[0],0)); 644 644 } 645 645 } /*}}}*/ … … 659 659 660 660 sprintf(fieldname,"%s%s",fields[f],"TimeMeanHistogram"); 661 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,size,nbins, 1,0));661 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allhisto,size,nbins,steps[0],0)); 662 662 sprintf(fieldname,"%s%s",fields[f],"TimeMeanMax"); 663 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,maxmeans[f],size,1, 1,0));663 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,maxmeans[f],size,1,steps[0],0)); 664 664 sprintf(fieldname,"%s%s",fields[f],"TimeMeanMin"); 665 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,minmeans[f],size,1, 1,0));665 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,minmeans[f],size,1,steps[0],0)); 666 666 } 667 667 } /*}}}*/ … … 892 892 893 893 sprintf(fieldname,"%s%s",fields[f],"Mean"); 894 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,mean, j+1,0));894 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,mean,steps[j],0)); 895 895 sprintf(fieldname,"%s%s",fields[f],"Stddev"); 896 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,stddev, j+1,0));896 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,stddev,steps[j],0)); 897 897 } 898 898 … … 931 931 932 932 sprintf(fieldname,"%s%s",fields[f],"Mean"); 933 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,mean,size,1, j+1,0));933 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,mean,size,1,steps[j],0)); 934 934 sprintf(fieldname,"%s%s",fields[f],"Stddev"); 935 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,stddev,size,1, j+1,0));935 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,stddev,size,1,steps[j],0)); 936 936 } 937 937 } … … 961 961 962 962 sprintf(fieldname,"%s%s",fields[f],"TimeMean"); 963 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,mean, 1,0));963 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,mean,steps[0],0)); 964 964 sprintf(fieldname,"%s%s",fields[f],"TimeStddev"); 965 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,stddev, 1,0));965 results->AddResult(new GenericExternalResult<IssmDouble>(results->Size()+1,fieldname,stddev,steps[0],0)); 966 966 } 967 967 } /*}}}*/ … … 994 994 995 995 sprintf(fieldname,"%s%s",fields[f],"TimeMean"); 996 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,mean,size,1, 1,0));996 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,mean,size,1,steps[0],0)); 997 997 sprintf(fieldname,"%s%s",fields[f],"TimeStddev"); 998 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,stddev,size,1, 1,0));998 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,stddev,size,1,steps[0],0)); 999 999 } 1000 1000 } /*}}}*/ … … 1142 1142 1143 1143 sprintf(fieldname,"%s%s",fields[f],"Samples"); 1144 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allx,nsamples,1, j+1,0));1144 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allx,nsamples,1,steps[j],0)); 1145 1145 } 1146 1146 } … … 1156 1156 char fieldname[1000]; 1157 1157 sprintf(fieldname,"%s%s",fields[f],"Samples"); 1158 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allx,nsamples,nindices, j+1,0));1158 results->AddResult(new GenericExternalResult<IssmPDouble*>(results->Size()+1,fieldname,allx,nsamples,nindices,steps[j],0)); 1159 1159 } 1160 1160 } … … 1190 1190 1191 1191 sprintf(outputfilename,"%s/%s.stats",directory,model); 1192 parameters->AddObject(new Stri ngParam(OutputFileNameEnum,outputfilename));1192 parameters->AddObject(new StrigParam(OutputFileNameEnum,outputfilename)); 1193 1193 1194 1194 /*Call OutputResults module:*/
Note:
See TracChangeset
for help on using the changeset viewer.