Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8935) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8936) @@ -404,4 +404,5 @@ QmuNumberOfResponsesEnum, QmuSaveFemmodelEnum, + PartEnum, IndexedEnum, RegularEnum, @@ -409,9 +410,9 @@ ScaledEnum, NodalEnum, - ResponseDescriptorsEnum, + ResponsedescriptorsEnum, PetscRcEnum, SparsityEnum, TolXEnum, //TO BE DELETED - VariableDescriptorsEnum, + VariabledescriptorsEnum, VerboseEnum, WaitOnLockEnum, //TO BE DELETED @@ -537,7 +538,5 @@ WaitonlockEnum, NumberOfVariablesEnum, - NumvariabledescriptorsEnum, NumberOfResponsesEnum, - NumresponsedescriptorsEnum, NpartEnum, QmuMassFluxNumProfilesEnum Index: /issm/trunk/src/c/io/Disk/IoModelFetchData.cpp =================================================================== --- /issm/trunk/src/c/io/Disk/IoModelFetchData.cpp (revision 8935) +++ /issm/trunk/src/c/io/Disk/IoModelFetchData.cpp (revision 8936) @@ -215,4 +215,85 @@ *pinteger=integer; +} +/*}}}*/ +/*FUNCTION IoModelFetchData(double*** pmatrices,int** pmdims,int** pndims, int* pM,FILE* model_handle,int data_enum){{{1*/ +void IoModelFetchData(double*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,FILE* model_handle,int data_enum){ + + int i; + + extern int my_rank; + extern int num_procs; + + /*output: */ + double** matrices=NULL; + int* mdims=NULL; + int* ndims=NULL; + int numrecords=0; + + /*intermediary: */ + int M,N; + double* matrix=NULL; + + FILE* fid=NULL; + + /*Set file pointer to beginning of the data: */ + fid=SetFilePointerToData(model_handle,data_enum); + + /*Now fetch: */ + if(my_rank==0){ + if(fread(&numrecords,sizeof(int),1,fid)!=1) _error_("could not read number of records in matrix array "); + } + MPI_Bcast(&numrecords,1,MPI_INT,0,MPI_COMM_WORLD); + + if(numrecords){ + + /*Allocate matrices :*/ + matrices=(double**)xmalloc(numrecords*sizeof(double*)); + mdims=(int*)xmalloc(numrecords*sizeof(int)); + ndims=(int*)xmalloc(numrecords*sizeof(int)); + + for(i=0;iAddObject(new StringParam(QmuErrNameEnum,qmuerrname)); /*}}}*/ - /*Deal with variable descriptors: {{{1*/ - variabledescriptors=(char**)xmalloc(iomodel->numvariabledescriptors*sizeof(char*)); - - /*Fetch descriptors: logic varies if we are running parallel or serial. In parallel, qmumarshall - * took care of marshalling all the variable descriptors, so it's easy. In serial mode, - * the variables are in md.variables(md.ivar), as a strucuture: */ - - for(i=0;inumvariabledescriptors;i++){ - sprintf(tag,"%s%i","variabledescriptor",i+1); - _error_("not yet"); - //IoModelFetchData(&descriptor,iomodel_handle,tag); - variabledescriptors[i]=descriptor; - } + /*Fetch variable descriptors: {{{1*/ + IoModelFetchData(&variabledescriptors,&numvariabledescriptors,iomodel_handle,VariabledescriptorsEnum); /*Ok, we have all the variable descriptors. Build a parameter with it: */ - parameters->AddObject(new StringArrayParam(VariableDescriptorsEnum,variabledescriptors,iomodel->numvariabledescriptors)); - - /*}}}*/ - /*Deal with response descriptors: {{{1*/ - responsedescriptors=(char**)xmalloc(iomodel->numresponsedescriptors*sizeof(char*)); - - /*Fetch descriptors: */ - for(i=0;inumresponsedescriptors;i++){ - sprintf(tag,"%s%i","responsedescriptor",i+1); - _error_("not yet"); - //IoModelFetchData(&descriptor,iomodel_handle,tag); - responsedescriptors[i]=descriptor; - } + parameters->AddObject(new StringArrayParam(VariabledescriptorsEnum,variabledescriptors,numvariabledescriptors)); + + /*}}}*/ + /*Fetch response descriptors: {{{1*/ + IoModelFetchData(&responsedescriptors,&numresponsedescriptors,iomodel_handle,ResponsedescriptorsEnum); /*Ok, we have all the response descriptors. Build a parameter with it: */ - parameters->AddObject(new StringArrayParam(ResponseDescriptorsEnum,responsedescriptors,iomodel->numresponsedescriptors)); + parameters->AddObject(new StringArrayParam(ResponsedescriptorsEnum,responsedescriptors,numresponsedescriptors)); parameters->AddObject(new IntParam(QmuNumberOfResponsesEnum,iomodel->numberofresponses)); /*}}}*/ @@ -107,6 +92,5 @@ parameters->AddObject(new IntParam(QmuNPartEnum,iomodel->qmu_npart)); - //IoModelFetchData(&dpart,NULL,NULL,iomodel_handle,PartEnum); - _error_("not yet"); + IoModelFetchData(&dpart,NULL,NULL,iomodel_handle,PartEnum); if(!dpart){ @@ -122,5 +106,5 @@ /*Deal with data needed because of qmu variables: {{{1*/ - for(i=0;inumvariabledescriptors;i++){ + for(i=0;inumresponsedescriptors;i++){ + for(i=0;iqmu_mass_flux_num_profiles==0)_error_(" qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!"); - - array=(double**)xmalloc(iomodel->qmu_mass_flux_num_profiles*sizeof(double*)); - mdims_array=(int*)xmalloc(iomodel->qmu_mass_flux_num_profiles*sizeof(int)); - ndims_array=(int*)xmalloc(iomodel->qmu_mass_flux_num_profiles*sizeof(int)); - M=iomodel->qmu_mass_flux_num_profiles; - - for(i=0;iAddObject(new DoubleMatArrayParam(QmuMassFluxSegmentsEnum,array,M,mdims_array,ndims_array)); + parameters->AddObject(new DoubleMatArrayParam(QmuMassFluxSegmentsEnum,array,qmu_mass_flux_num_profiles,mdims_array,ndims_array)); /*Free data: */ @@ -211,9 +187,7 @@ } /*}}}*/ - parameters->AddObject(new BoolParam(QmuSaveFemmodelEnum,iomodel->qmu_save_femmodel)); - /*Free data: {{{1*/ - for(i=0;inumresponsedescriptors;i++){ + for(i=0;inumvariabledescriptors;i++){ + for(i=0;iparameters->FindParam(&responses_descriptors,&numresponsedescriptors,ResponseDescriptorsEnum); + femmodel->parameters->FindParam(&responses_descriptors,&numresponsedescriptors,ResponsedescriptorsEnum); femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8935) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8936) @@ -352,4 +352,5 @@ else if (strcmp(name,"QmuNumberOfResponses")==0) return QmuNumberOfResponsesEnum; else if (strcmp(name,"QmuSaveFemmodel")==0) return QmuSaveFemmodelEnum; + else if (strcmp(name,"Part")==0) return PartEnum; else if (strcmp(name,"Indexed")==0) return IndexedEnum; else if (strcmp(name,"Regular")==0) return RegularEnum; @@ -357,9 +358,9 @@ else if (strcmp(name,"Scaled")==0) return ScaledEnum; else if (strcmp(name,"Nodal")==0) return NodalEnum; - else if (strcmp(name,"ResponseDescriptors")==0) return ResponseDescriptorsEnum; + else if (strcmp(name,"Responsedescriptors")==0) return ResponsedescriptorsEnum; else if (strcmp(name,"PetscRc")==0) return PetscRcEnum; else if (strcmp(name,"Sparsity")==0) return SparsityEnum; else if (strcmp(name,"TolX")==0) return TolXEnum; - else if (strcmp(name,"VariableDescriptors")==0) return VariableDescriptorsEnum; + else if (strcmp(name,"Variabledescriptors")==0) return VariabledescriptorsEnum; else if (strcmp(name,"Verbose")==0) return VerboseEnum; else if (strcmp(name,"WaitOnLock")==0) return WaitOnLockEnum; @@ -476,7 +477,5 @@ else if (strcmp(name,"Waitonlock")==0) return WaitonlockEnum; else if (strcmp(name,"NumberOfVariables")==0) return NumberOfVariablesEnum; - else if (strcmp(name,"Numvariabledescriptors")==0) return NumvariabledescriptorsEnum; else if (strcmp(name,"NumberOfResponses")==0) return NumberOfResponsesEnum; - else if (strcmp(name,"Numresponsedescriptors")==0) return NumresponsedescriptorsEnum; else if (strcmp(name,"Npart")==0) return NpartEnum; else if (strcmp(name,"QmuMassFluxNumProfiles")==0) return QmuMassFluxNumProfilesEnum; Index: /issm/trunk/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk/src/c/objects/IoModel.cpp (revision 8935) +++ /issm/trunk/src/c/objects/IoModel.cpp (revision 8936) @@ -233,9 +233,6 @@ if(this->qmu_analysis){ IoModelFetchData(&this->numberofvariables,iomodel_handle,NumberOfVariablesEnum); - IoModelFetchData(&this->numvariabledescriptors,iomodel_handle,NumvariabledescriptorsEnum); IoModelFetchData(&this->numberofresponses,iomodel_handle,NumberOfResponsesEnum); - IoModelFetchData(&this->numresponsedescriptors,iomodel_handle,NumresponsedescriptorsEnum); IoModelFetchData(&this->qmu_npart,iomodel_handle,NpartEnum); - IoModelFetchData(&this->qmu_mass_flux_num_profiles,iomodel_handle,QmuMassFluxNumProfilesEnum); IoModelFetchData(&this->qmu_save_femmodel,iomodel_handle,QmuSaveFemmodelEnum); } Index: /issm/trunk/src/c/objects/IoModel.h =================================================================== --- /issm/trunk/src/c/objects/IoModel.h (revision 8935) +++ /issm/trunk/src/c/objects/IoModel.h (revision 8936) @@ -200,5 +200,4 @@ /*qmu: */ - int qmu_mass_flux_num_profiles; int qmu_save_femmodel; Index: /issm/trunk/src/m/classes/model.m =================================================================== --- /issm/trunk/src/m/classes/model.m (revision 8935) +++ /issm/trunk/src/m/classes/model.m (revision 8936) @@ -332,16 +332,13 @@ dakotadat={'',false}; qmu_analysis={0,true,'Integer'}; - part={[],false}; + part={[],true,'Mat'}; npart={0,true,'Integer'}; numberofvariables={0,true,'Integer'}; numberofresponses={0,true,'Integer'}; - variabledescriptors={NaN,false}; - responsedescriptors={NaN,false}; - numvariabledescriptors={0,true,'Integer'}; - numresponsedescriptors={0,true,'Integer'}; - qmu_mass_flux_num_profiles={0,true,'Integer'}; + variabledescriptors={{},true,'StringArray'}; + responsedescriptors={{},true,'StringArray'}; qmu_mass_flux_profile_directory={NaN,false}; qmu_mass_flux_profiles={NaN,false}; - qmu_mass_flux_segments={NaN,false}; + qmu_mass_flux_segments={{},true,'MatArray'}; qmu_relax={0,false}; qmu_save_femmodel={0,true,'Integer'}; Index: /issm/trunk/src/m/model/WriteData.m =================================================================== --- /issm/trunk/src/m/model/WriteData.m (revision 8935) +++ /issm/trunk/src/m/model/WriteData.m (revision 8936) @@ -40,4 +40,5 @@ %first write length of record fwrite(fid,4,'int'); %1 integer + %now write integer fwrite(fid,data,'int'); @@ -50,6 +51,5 @@ %first get length of string array: - num=length(data); - + num=numel(data); %now get length of record: recordlength=4; %for length of array @@ -71,4 +71,31 @@ fwrite(fid,string,'char'); end +elseif strcmpi(data_type,'MatArray'), + + numrecords=numel(data); + + %first get length of record + recordlength=4; %number of records= + for i=1:numrecords, + matrix=data{i}; + s=size(matrix); + recordlength=recordlength+4*2+... %row and col of matrix + s(1)*s(2)*8; %matrix of doubles + end + + %write length of record + fwrite(fid,recordlength,'int'); + + %write data, first number of records + fwrite(fid,numrecords,'int'); + + %write each matrix: + for i=1:numrecords, + matrix=data{i}; + s=size(matrix); + fwrite(fid,s(1),'int'); + fwrite(fid,s(2),'int'); + fwrite(fid,matrix,'double'); + end else error('WriteData error message: data type not supported yet!'); Index: /issm/trunk/src/m/model/solve.m =================================================================== --- /issm/trunk/src/m/model/solve.m (revision 8935) +++ /issm/trunk/src/m/model/solve.m (revision 8936) @@ -59,8 +59,4 @@ marshall(md); -%add qmu fields to binary file if running qmu analysis -if md.qmu_analysis, - qmumarshall(md,md.variables(options.ivar),md.responses(options.iresp)); -end %write a template file for issm to use, in parallel Index: /issm/trunk/src/m/qmu/preqmu.m =================================================================== --- /issm/trunk/src/m/qmu/preqmu.m (revision 8935) +++ /issm/trunk/src/m/qmu/preqmu.m (revision 8936) @@ -103,6 +103,4 @@ md.variabledescriptors=variabledescriptors; md.responsedescriptors=responsedescriptors; -md.numvariabledescriptors=numel(md.variabledescriptors); -md.numresponsedescriptors=numel(md.responsedescriptors); %now, we have to provide all the info necessary for the solutions to compute the responses. For ex, if mass_flux Index: /issm/trunk/src/m/qmu/process_qmu_response_data.m =================================================================== --- /issm/trunk/src/m/qmu/process_qmu_response_data.m (revision 8935) +++ /issm/trunk/src/m/qmu/process_qmu_response_data.m (revision 8936) @@ -43,5 +43,5 @@ end - %ok, process the domains named in qmu_mass_flux_profiles, to build a list of segments + %ok, process the domains named in qmu_mass_flux_profiles, to build a list of segments (MatArray) md.qmu_mass_flux_segments=cell(num_mass_flux,1); @@ -50,5 +50,3 @@ end - %finally, set qmu_mass_flux_num_profiles, for future marshalling - md.qmu_mass_flux_num_profiles=num_mass_flux; end