Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 19792) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 19793) @@ -112,6 +112,8 @@ char *lockfilename = NULL; - this->parameters->FindParam(&outbinfilename,OutputFileNameEnum); - this->parameters->FindParam(&lockfilename,LockFileNameEnum); + #ifndef _HAVE_JAVASCRIPT_ + if(this->parameters->Exist(OutputFileNameEnum)) this->parameters->FindParam(&outbinfilename,OutputFileNameEnum); + if(this-parameters->Exist(LockFileNameEnum)) this->parameters->FindParam(&lockfilename,LockFileNameEnum); + #endif /*Delete all the datasets: */ @@ -2335,2 +2337,119 @@ } /*}}}*/ + +#ifdef _HAVE_JAVASCRIPT_ +FemModel::FemModel(IssmDouble* buffer, int buffersize, char* toolkits, char* solution, char* modelname,ISSM_MPI_Comm incomm, bool trace){ /*{{{*/ + /*configuration: */ + int solution_type; + int ierr; + + /*First things first, store the communicator, and set it as a global variable: */ + this->comm=incomm; + this->SetStaticComm(); + + /*Start profiler: */ + this->profiler=new Profiler(); + profiler->Tag(Start); + + /*From command line arguments, retrieve different filenames needed to create the FemModel: */ + solution_type=StringToEnumx(solution); + + /*Create femmodel from input files: */ + profiler->Tag(StartInit); + this->InitFromBuffers((char*)buffer,buffersize,toolkits, solution_type,trace,NULL); + profiler->Tag(FinishInit); + +} +/*}}}*/ +void FemModel::InitFromBuffers(char* buffer, int buffersize, char* toolkits, int in_solution_type, bool trace, IssmPDouble* X){/*{{{*/ + + /*intermediary*/ + int i; + int analysis_type; + FILE *IOMODEL = NULL; + FILE *toolkitsoptionsfid = NULL; + FILE *output_fid = NULL; + int my_rank; + size_t outputsize; + char *outputbuffer; + const char* rootpath=""; //needed for Dakota runs only, which we won't do here. + + /*recover my_rank:*/ + my_rank=IssmComm::GetRank(); + + /*Initialize internal data: */ + this->solution_type = in_solution_type; + this->analysis_counter = nummodels-1; //point to last analysis_type carried out. + this->results = new Results(); //not initialized by CreateDataSets + + /*Open input file on cpu 0 and create IoModel */ + if(my_rank==0) IOMODEL = fmemopen((void*)buffer, buffersize, "rb"); + IoModel* iomodel = new IoModel(IOMODEL,in_solution_type,trace,X); + + /*Figure out what analyses are activated for this solution*/ + SolutionAnalysesList(&this->analysis_type_list,&this->nummodels,iomodel,this->solution_type); + + /*Open toolkits file: */ + toolkitsoptionsfid=fmemopen((void*)toolkits, strlen(toolkits)+1, "r"); + + /*create datasets for all analyses*/ + ModelProcessorx(&this->elements,&this->nodes,&this->vertices,&this->materials,&this->constraints,&this->loads,&this->parameters,iomodel,toolkitsoptionsfid,(char*)rootpath,this->solution_type,this->nummodels,this->analysis_type_list); + + /*do the post-processing of the datasets to get an FemModel that can actually run analyses: */ + for(i=0;iSetCurrentConfiguration(analysis_type); + + if(i==0){ + if(VerboseMProcessor()) _printf0_(" creating vertex PIDs\n"); + VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices + } + + if(VerboseMProcessor()) _printf0_(" resolving node constraints\n"); + SpcNodesx(nodes,constraints,parameters,analysis_type); + + if(VerboseMProcessor()) _printf0_(" creating nodal degrees of freedom\n"); + NodesDofx(nodes,parameters,analysis_type); + + if(VerboseMProcessor()) _printf0_(" configuring element and loads\n"); + ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters); + } + + /*Close input file and toolkits file descriptors: */ + if(my_rank==0) fclose(IOMODEL); + fclose(toolkitsoptionsfid); + + /*Open output file once for all and add output file descriptor to parameters*/ + output_fid=open_memstream(&outputbuffer,&outputsize); + if(output_fid==NULL)_error_("FemModel::InitFromBuffers error message: could not initialize output stream"); + this->parameters->SetParam(output_fid,OutputFilePointerEnum); + + /*Clean up*/ + delete iomodel; +}/*}}}*/ +void FemModel::CleanUpJs(void){/*{{{*/ + + /*Intermediary*/ + FILE *output_fid; + + /*Close output file: */ + this->parameters->FindParam(&output_fid,OutputFilePointerEnum); + fclose(output_fid); + + /*Before we delete the profiler, report statistics for this run: */ + profiler->Tag(Finish); //final tagging + _printf0_("\n"); + _printf0_(" "<DeltaTime(StartInit,FinishInit) << "\n"); + _printf0_(" "<DeltaTime(StartCore,FinishCore) << "\n"); + _printf0_("\n"); + _printf0_(" Total elapsed time: " + <DeltaTimeModHour(Start,Finish)<<" hrs " + <DeltaTimeModMin(Start,Finish)<<" min " + <DeltaTimeModSec(Start,Finish)<<" sec" + ); + _printf0_("\n"); +} +/*}}}*/ +#endif Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 19792) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 19793) @@ -119,5 +119,12 @@ void HydrologyEPLupdateDomainx(IssmDouble* pEplcount); void UpdateConstraintsL2ProjectionEPLx(IssmDouble* pL2count); + + #ifdef _HAVE_JAVASCRIPT_ + FemModel(IssmDouble* buffer, int buffersize, char* toolkits, char* solution, char* modelname,ISSM_MPI_Comm incomm, bool trace=false); + void InitFromBuffers(char* buffer, int buffersize, char* toolkits, int solution_type,bool trace,IssmPDouble* X=NULL); + void CleanUpJs(void); + #endif }; + #endif Index: /issm/trunk-jpl/src/m/array/arrayoperations.js =================================================================== --- /issm/trunk-jpl/src/m/array/arrayoperations.js (revision 19792) +++ /issm/trunk-jpl/src/m/array/arrayoperations.js (revision 19793) @@ -112,8 +112,14 @@ function IsArray(object) { //{{{ - if( Object.prototype.toString.call( object ) === '[object Array]' ) { - return 1; - } - else return 0; + var type=Object.prototype.toString.call( object ); + if( type === '[object Array]' ) return 1; + if( type === '[object Float64Array]' ) return 1; + if( type === '[object Float32Array]' ) return 1; + if( type === '[object Int32Array]' ) return 1; + if( type === '[object Int16Array]' ) return 1; + if( type === '[object Uint32Array]' ) return 1; + if( type === '[object Uint16Array]' ) return 1; + if( type === '[object Uint8Array]' ) return 1; + return 0; } //}}} Index: /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js (revision 19792) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.js (revision 19793) @@ -31,5 +31,6 @@ md.stressbalance.spcvy=NewArrayFill(md.mesh.numberofvertices,NaN); md.stressbalance.spcvz=NewArrayFill(md.mesh.numberofvertices,NaN); - md.stressbalance.referential=NewArrayFill(md.mesh.numberofvertices,NaN); + md.stressbalance.referential=Create2DArray(md.mesh.numberofvertices,6); + for(var i=0;i0){ - //we wait for the done file - done=waitonlock(md); - if (md.verbose.solution){ - console.log('loading results from cluster'); + //wait on lock + if (md.settings.waitonlock == 'NaN'){ + //load when user enters 'y' + console.log('solution launched on remote cluster. log in to detect job completion.'); + throw Error("solve error message: user detection of successfull completion of job not support yet!"); + /*choice=input('Is the job successfully completed? (y/n)','s'); + if ~strcmp(choice,'y'), + console.log('Results not loaded... exiting'); + else + md=loadresultsfromcluster(md); + end*/ } - loadresultsfromcluster(md); - } - else if (md.settings.waitonlock==0){ - console.log('Model results must be loaded manually with md=loadresultsfromcluster(md);'); - } + else if (md.settings.waitonlock>0){ + //we wait for the done file + done=waitonlock(md); + if (md.verbose.solution){ + console.log('loading results from cluster'); + } + loadresultsfromcluster(md); + } + else if (md.settings.waitonlock==0){ + console.log('Model results must be loaded manually with md=loadresultsfromcluster(md);'); + } - //post processes qmu results if necessary - if (md.qmu.isdakota){ - /*if ~strncmpi(options.getfieldvalue('keep','y'),'y',1) - system(['rm -rf qmu' num2str(feature('GetPid'))]); - end*/ + //post processes qmu results if necessary + if (md.qmu.isdakota){ + /*if ~strncmpi(options.getfieldvalue('keep','y'),'y',1) + system(['rm -rf qmu' num2str(feature('GetPid'))]); + end*/ + } + } //}}} + else{ //if (cluster.classname() == 'local') + + /*We are running locally on the machine, using the issm module:*/ + console.log('running issm locally'); + + //Call issm: + issm(fid, toolkitsstring, solutionstring, md.miscellaneous.name); } } Index: /issm/trunk-jpl/src/wrappers/Issm/issm.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/Issm/issm.cpp (revision 19793) +++ /issm/trunk-jpl/src/wrappers/Issm/issm.cpp (revision 19793) @@ -0,0 +1,41 @@ +/*!\file: issm.cpp + * \brief: ISSM main program + */ + +#include "../../c/main/issm.h" + +extern "C" { + int IssmModule(double* buffer, int buffersize, char* toolkits,char* solution,char* modelname){ + + /*Initialize exception trapping: */ + ExceptionTrapBegin(); + + /*Initialize environment: */ + ISSM_MPI_Comm comm_init=EnvironmentInit(0,NULL); + + /*Initialize femmodel from arguments provided command line: */ + FemModel *femmodel = new FemModel(buffer,buffersize,toolkits,solution,modelname,comm_init); + + /*Solve: */ + femmodel->Solve(); + + /*Output results: */ + OutputResultsx(femmodel); + + /*Wrap up: */ + femmodel->CleanUpJs(); + + /*Delete Model: */ + delete femmodel; + + /*Finalize environment:*/ + EnvironmentFinalize(); + + /*Finalize exception trapping: */ + ExceptionTrapEnd(); + + /*Return unix success: */ + return 0; + + } +} //extern "C" Index: /issm/trunk-jpl/src/wrappers/Issm/issm.js =================================================================== --- /issm/trunk-jpl/src/wrappers/Issm/issm.js (revision 19793) +++ /issm/trunk-jpl/src/wrappers/Issm/issm.js (revision 19793) @@ -0,0 +1,26 @@ +function issm(fid,toolkitstring,solutionstring,modelname){ +/*issm + usage: var output = issm(fid,toolkitstring); + where: fid is a pointer to a memory buffer created by marshall, toolkitstring is a toolkits + string created by ToolkitsToFile and + output is a binary buffer to be read by loadresultsfromcluster. +*/ + + var binarybuffer=fid.rawbuffer(); //binarybuffer is now an arraybuffer + var nb = fid.ptr; //size of array buffer in bytes. + + /*var dbinary=new Float64Array(binarybuffer); var nb=dbinary.length * dbinary.BYTES_PER_ELEMENT; + var dbinaryPtr= Module._malloc(nb); var binHeap = new Uint8Array(Module.HEAPU8.buffer,dbinaryPtr,nb); + binHeap.set(new Uint8Array(dbinary.buffer)); var binary=binHeap.byteOffset;*/ + + var dbinaryPtr= Module._malloc(nb); var binHeap = new Uint8Array(Module.HEAPU8.buffer,dbinaryPtr,nb); + binHeap.set(new Uint8Array(binarybuffer)); var binary=binHeap.byteOffset; + + //Declare TriMesh module: + issmmodule= Module.cwrap('IssmModule','number',['number','number','string','string','string']); + + //Call issm: + var output = issmmodule(binary, nb, toolkitstring,solutionstring,modelname); + + return output; +} Index: /issm/trunk-jpl/src/wrappers/javascript/Makefile.am =================================================================== --- /issm/trunk-jpl/src/wrappers/javascript/Makefile.am (revision 19792) +++ /issm/trunk-jpl/src/wrappers/javascript/Makefile.am (revision 19793) @@ -14,5 +14,6 @@ ../IssmConfig/IssmConfig.js\ ../EnumToString/EnumToString.js\ - ../StringToEnum/StringToEnum.js + ../StringToEnum/StringToEnum.js\ + ../Issm/issm.js #javascript io{{{ @@ -84,7 +85,7 @@ ../EnumToString/EnumToString.cpp\ ../StringToEnum/StringToEnum.cpp\ - ../../c/main/issm.cpp + ../Issm/issm.cpp -IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_EnumToStringModule','_StringToEnumModule','_main']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -IssmModule_LDADD = ${deps} $(TRIANGLELIB) +IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_EnumToStringModule','_StringToEnumModule','_IssmModule']" -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0 +IssmModule_LDADD = ${deps} $(TRIANGLELIB) $(GSLLIB) #}}} Index: /issm/trunk-jpl/test/NightlyRun/test101.html =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.html (revision 19792) +++ /issm/trunk-jpl/test/NightlyRun/test101.html (revision 19793) @@ -50,5 +50,5 @@ - + @@ -81,6 +81,6 @@ + - @@ -97,9 +97,10 @@ parameterize(md); setflowequation(md,'SSA','all'); + md.verbose.solution=1; md.verbose.convergence=1; md=solve(md,StressbalanceSolutionEnum(),'checkconsistency','no'); - /*plotmodel(md,'data',md.initialization.vel,'colorbar','on','data',md.initialization.vx, - 'data',md.initialization.temperature, 'data',md.basalforcings.floatingice_melting_rate,'data','mesh'); - //var output=issm([5,1,1]);*/ + /*plotmodel(md,'data',md.initialization.vel,'colorbar','on','colorbarheight',.5,'data',md.initialization.vx, + 'data',md.initialization.temperature, 'data',md.basalforcings.floatingice_melting_rate,'data','mesh');*/ + //var output=issm([5,1,1]); Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 19792) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 19793) @@ -11,4 +11,5 @@ md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; md.geometry.surface=md.geometry.base+md.geometry.thickness; +md.geometry.bed=md.geometry.base-10; %Initial velocity