Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp (revision 3085) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp (revision 3086) @@ -34,5 +34,5 @@ int TransientAnalysisEnum(void){ return 231; } //slope -int SlopeComputeAnalysisEnum(void){ return 240; } +int SlopecomputeAnalysisEnum(void){ return 240; } int SurfaceXAnalysisEnum(void){ return 241; } int SurfaceYAnalysisEnum(void){ return 242; } Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 3085) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 3086) @@ -35,5 +35,5 @@ int TransientAnalysisEnum(void); //slope -int SlopeComputeAnalysisEnum(void); +int SlopecomputeAnalysisEnum(void); int SurfaceXAnalysisEnum(void); int SurfaceYAnalysisEnum(void); Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 3085) +++ /issm/trunk/src/c/Makefile.am (revision 3086) @@ -656,4 +656,5 @@ ./parallel/balancedthickness_core.cpp\ ./parallel/balancedvelocities_core.cpp\ + ./parallel/slopecompute_core.cpp\ ./parallel/transient_core.cpp\ ./parallel/transient_core_2d.cpp\ @@ -686,5 +687,5 @@ bin_PROGRAMS = else -bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe +bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe endif @@ -709,4 +710,7 @@ balancedvelocities_exe_CXXFLAGS= -fPIC -D_PARALLEL_ +slopecompute_exe_SOURCES = parallel/slopecompute.cpp +slopecompute_exe_CXXFLAGS= -fPIC -D_PARALLEL_ + transient_exe_SOURCES = parallel/transient.cpp transient_exe_CXXFLAGS= -fPIC -D_PARALLEL_ Index: /issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp (revision 3085) +++ /issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp (revision 3086) @@ -56,5 +56,5 @@ } } - else if (iomodel->analysis_type==SlopeComputeAnalysisEnum()){ + else if (iomodel->analysis_type==SlopecomputeAnalysisEnum()){ CreateElementsNodesAndMaterialsSlopeCompute(pelements,pnodes,pmaterials, iomodel,iomodel_handle); Index: /issm/trunk/src/c/objects/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Penta.cpp (revision 3085) +++ /issm/trunk/src/c/objects/Penta.cpp (revision 3086) @@ -313,5 +313,5 @@ else throw ErrorException(__FUNCT__,exprintf("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet")); } - else if (analysis_type==SlopeComputeAnalysisEnum()){ + else if (analysis_type==SlopecomputeAnalysisEnum()){ CreateKMatrixSlopeCompute( Kgg,inputs,analysis_type,sub_analysis_type); @@ -1425,5 +1425,5 @@ else throw ErrorException(__FUNCT__,exprintf("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet")); } - else if (analysis_type==SlopeComputeAnalysisEnum()){ + else if (analysis_type==SlopecomputeAnalysisEnum()){ CreatePVectorSlopeCompute( pg,inputs,analysis_type,sub_analysis_type); Index: /issm/trunk/src/c/objects/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Tria.cpp (revision 3085) +++ /issm/trunk/src/c/objects/Tria.cpp (revision 3086) @@ -288,5 +288,5 @@ } - else if (analysis_type==SlopeComputeAnalysisEnum()){ + else if (analysis_type==SlopecomputeAnalysisEnum()){ CreateKMatrixSlopeCompute( Kgg,inputs,analysis_type,sub_analysis_type); @@ -1755,5 +1755,5 @@ else throw ErrorException(__FUNCT__,exprintf("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet")); } - else if (analysis_type==SlopeComputeAnalysisEnum()){ + else if (analysis_type==SlopecomputeAnalysisEnum()){ CreatePVectorSlopeCompute( pg,inputs,analysis_type,sub_analysis_type); Index: /issm/trunk/src/c/parallel/ControlInitialization.cpp =================================================================== --- /issm/trunk/src/c/parallel/ControlInitialization.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/ControlInitialization.cpp (revision 3086) @@ -67,5 +67,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); //specific parameters for specific models @@ -84,6 +84,6 @@ //compute slopes if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)..."); - diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum()); - diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum()); + diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum()); + diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum()); FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0); Index: /issm/trunk/src/c/parallel/ProcessResults.cpp =================================================================== --- /issm/trunk/src/c/parallel/ProcessResults.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/ProcessResults.cpp (revision 3086) @@ -75,4 +75,12 @@ double* surface=NULL; + Vec sx_g=NULL; + double* sx_g_serial=NULL; + double* slopex=NULL; + + Vec sy_g=NULL; + double* sy_g_serial=NULL; + double* slopey=NULL; + Vec b_g=NULL; double* b_g_serial=NULL; @@ -115,5 +123,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); if(analysis_type==PrognosticAnalysisEnum()){ fem_p=model->GetFormulation(PrognosticAnalysisEnum()); @@ -407,4 +415,50 @@ VecFree(&s_g); } + else if(strcmp(result->GetFieldName(),"sx_g")==0){ + /*easy, s_g is of size numberofnodes, on 1 dof, just repartition: */ + result->GetField(&sx_g); + VecToMPISerial(&sx_g_serial,sx_g); + fem_sl->parameters->FindParam(&numberofnodes,"numberofnodes"); + VecToMPISerial(&partition,fem_sl->partition->vector); + + slopex=(double*)xmalloc(numberofnodes*sizeof(double)); + + for(i=0;iSize()+1,result->GetTime(),result->GetStep(),"slopex",slopex,numberofnodes); + newresults->AddObject(newresult); + + /*do some cleanup: */ + xfree((void**)&sx_g_serial); + xfree((void**)&partition); + xfree((void**)&slopex); + VecFree(&sx_g); + } + else if(strcmp(result->GetFieldName(),"sy_g")==0){ + /*easy, s_g is of size numberofnodes, on 1 dof, just repartition: */ + result->GetField(&sy_g); + VecToMPISerial(&sy_g_serial,sy_g); + fem_sl->parameters->FindParam(&numberofnodes,"numberofnodes"); + VecToMPISerial(&partition,fem_sl->partition->vector); + + slopey=(double*)xmalloc(numberofnodes*sizeof(double)); + + for(i=0;iSize()+1,result->GetTime(),result->GetStep(),"slopey",slopey,numberofnodes); + newresults->AddObject(newresult); + + /*do some cleanup: */ + xfree((void**)&sy_g_serial); + xfree((void**)&partition); + xfree((void**)&slopey); + VecFree(&sy_g); + } else if(strcmp(result->GetFieldName(),"b_g")==0){ /*easy, b_g is of size numberofnodes, on 1 dof, just repartition: */ Index: /issm/trunk/src/c/parallel/balancedthickness.cpp =================================================================== --- /issm/trunk/src/c/parallel/balancedthickness.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/balancedthickness.cpp (revision 3086) @@ -143,5 +143,4 @@ delete processedresults; delete results; - delete model; delete inputs; Index: /issm/trunk/src/c/parallel/diagnostic.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/diagnostic.cpp (revision 3086) @@ -90,5 +90,5 @@ _printf_("\n reading surface and bed slope computation model data:\n"); - model->AddFormulation(fid,SlopeComputeAnalysisEnum()); + model->AddFormulation(fid,SlopecomputeAnalysisEnum()); /*get parameters: */ Index: /issm/trunk/src/c/parallel/diagnostic_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic_core.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/diagnostic_core.cpp (revision 3086) @@ -77,5 +77,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); //specific parameters for specific models @@ -93,6 +93,6 @@ if(verbose)_printf_("%s\n","computing surface slope (x and y derivatives)..."); - diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceXAnalysisEnum()); - diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceYAnalysisEnum()); + diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceXAnalysisEnum()); + diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceYAnalysisEnum()); if (dim==3){ @@ -161,6 +161,6 @@ if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)..."); - diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum()); - diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum()); + diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum()); + diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum()); FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0); FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0); Index: /issm/trunk/src/c/parallel/parallel.h =================================================================== --- /issm/trunk/src/c/parallel/parallel.h (revision 3085) +++ /issm/trunk/src/c/parallel/parallel.h (revision 3086) @@ -19,4 +19,5 @@ void balancedthickness_core(DataSet* results,Model* model, ParameterInputs* inputs); void balancedvelocities_core(DataSet* results,Model* model, ParameterInputs* inputs); +void slopecompute_core(DataSet* results,Model* model, ParameterInputs* inputs); void control_core(DataSet* results,Model* model, ParameterInputs* inputs); Index: /issm/trunk/src/c/parallel/slopecompute.cpp =================================================================== --- /issm/trunk/src/c/parallel/slopecompute.cpp (revision 3086) +++ /issm/trunk/src/c/parallel/slopecompute.cpp (revision 3086) @@ -0,0 +1,127 @@ +/*!\file: slopecompute.cpp + * \brief: slopecompute solution + */ + +#include "../issm.h" +#include "./parallel.h" + +#undef __FUNCT__ +#define __FUNCT__ "slopecompute" + +#ifdef HAVE_CONFIG_H + #include "config.h" +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + + +int main(int argc,char* *argv){ + + /*I/O: */ + FILE* fid=NULL; + char* inputfilename=NULL; + char* outputfilename=NULL; + char* lockname=NULL; + int numberofnodes; + double waitonlock=0; + + Model* model=NULL; + + /*Results: */ + DataSet* results=NULL; + DataSet* processedresults=NULL; + Result* result=NULL; + + ParameterInputs* inputs=NULL; + Param* param=NULL; + + /*time*/ + double start, finish; + double start_core, finish_core; + double start_init, finish_init; + + MODULEBOOT(); + + #if !defined(_PARALLEL_) || (defined(_PARALLEL_) && !defined(_HAVE_PETSC_)) + throw ErrorException(__FUNCT__," parallel executable was compiled without support of parallel libraries!"); + #endif + + /*Initialize Petsc and get start time*/ + PetscInitialize(&argc,&argv,(char *)0,""); + MPI_Barrier(MPI_COMM_WORLD); start=MPI_Wtime(); + + /*Size and rank: */ + MPI_Comm_rank(MPI_COMM_WORLD,&my_rank); + MPI_Comm_size(MPI_COMM_WORLD,&num_procs); + + _printf_("recover , input file name and output file name:\n"); + inputfilename=argv[2]; + outputfilename=argv[3]; + lockname=argv[4]; + + /*Initialize model structure: */ + MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime(); + model=new Model(); + + /*Open handle to data on disk: */ + fid=pfopen(inputfilename,"rb"); + + /*Initialize model structure: */ + model=new Model(); + + _printf_("read and create finite element model:\n"); + model->AddFormulation(fid,SlopecomputeAnalysisEnum()); + + /*recover parameters: */ + model->FindParam(&waitonlock,"waitonlock"); + + _printf_("initialize inputs:\n"); + + model->FindParam(&numberofnodes,"numberofnodes"); + + inputs=new ParameterInputs; + + _printf_("initialize results:\n"); + results=new DataSet(ResultsEnum()); + MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime(); + + /*run slopecompute analysis: */ + _printf_("call computational core:\n"); + MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( ); + slopecompute_core(results,model,inputs); + MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( ); + + /*Add analysis_type to results: */ + result=new Result(results->Size()+1,0,1,"analysis_type","slopecompute"); + results->AddObject(result); + + _printf_("process results:\n"); + ProcessResults(&processedresults,results,model,SlopecomputeAnalysisEnum()); + + _printf_("write results to disk:\n"); + OutputResults(processedresults,outputfilename); + + if (waitonlock>0){ + _printf_("write lock file:\n"); + WriteLockFile(lockname); + } + + /*Free ressources:*/ + delete processedresults; + delete results; + delete model; + delete inputs; + + /*Get finish time and close*/ + MPI_Barrier(MPI_COMM_WORLD); finish = MPI_Wtime( ); + _printf_("\n %-34s %f seconds \n","Model initialization elapsed time:",finish_init-start_init); + _printf_(" %-34s %f seconds \n","Core solution elapsed time:",finish_core-start_core); + _printf_(" %-34s %f seconds\n\n","Total elapsed time:",finish-start); + _printf_("closing MPI and Petsc\n"); + PetscFinalize(); + + /*end module: */ + MODULEEND(); + + return 0; //unix success return; +} Index: /issm/trunk/src/c/parallel/slopecompute_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/slopecompute_core.cpp (revision 3086) +++ /issm/trunk/src/c/parallel/slopecompute_core.cpp (revision 3086) @@ -0,0 +1,60 @@ +/*!\file: slopecompute_core.cpp + * \brief: core of the slopecompute solution + */ + +#undef __FUNCT__ +#define __FUNCT__ "slopecompute_core" + +#include "../toolkits/toolkits.h" +#include "../objects/objects.h" +#include "../shared/shared.h" +#include "../EnumDefinitions/EnumDefinitions.h" +#include "./parallel.h" +#include "../issm.h" + +void slopecompute_core(DataSet* results,Model* model,ParameterInputs* inputs){ + + extern int my_rank; + + /*output: */ + Result* result=NULL; + + /*solutions: */ + Vec sx_g=NULL; + Vec sy_g=NULL; + + /*flags: */ + int verbose=0; + int numberofdofspernode; + int numberofnodes; + int dofs[2]={1,1}; + + /*fem slopecompute model: */ + FemModel* fem_sl=NULL; + + /*recover fem model: */ + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); + + //first recover parameters common to all solutions + model->FindParam(&verbose,"verbose"); + model->FindParam(&numberofnodes,"numberofnodes"); + model->FindParam(&numberofdofspernode,"numberofdofspernode"); + + _printf_("call computational core:\n"); + diagnostic_core_linear(&sx_g,fem_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceXAnalysisEnum()); + diagnostic_core_linear(&sy_g,fem_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceYAnalysisEnum()); + + _printf_("extrude computed slope on all layers:\n"); + FieldExtrudex( sx_g, fem_sl->elements,fem_sl->nodes, fem_sl->loads, fem_sl->materials,fem_sl->parameters,"slopex",0); + FieldExtrudex( sy_g, fem_sl->elements,fem_sl->nodes, fem_sl->loads, fem_sl->materials,fem_sl->parameters,"slopey",0); + + /*Plug results into output dataset: */ + result=new Result(results->Size()+1,0,1,"sx_g",sx_g); + results->AddObject(result); + result=new Result(results->Size()+1,0,1,"sy_g",sy_g); + results->AddObject(result); + + /*Free ressources:*/ + VecFree(&sx_g); + VecFree(&sy_g); +} Index: /issm/trunk/src/c/parallel/steadystate.cpp =================================================================== --- /issm/trunk/src/c/parallel/steadystate.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/steadystate.cpp (revision 3086) @@ -93,5 +93,5 @@ _printf_("\n reading surface and bed slope computation model data:\n"); - model->AddFormulation(fid,SlopeComputeAnalysisEnum()); + model->AddFormulation(fid,SlopecomputeAnalysisEnum()); _printf_("\n read and create thermal finite element model:\n"); Index: /issm/trunk/src/c/parallel/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/steadystate_core.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/steadystate_core.cpp (revision 3086) @@ -58,5 +58,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); fem_t=model->GetFormulation(ThermalAnalysisEnum()); fem_m=model->GetFormulation(MeltingAnalysisEnum()); Index: /issm/trunk/src/c/parallel/transient.cpp =================================================================== --- /issm/trunk/src/c/parallel/transient.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/transient.cpp (revision 3086) @@ -91,5 +91,5 @@ _printf_("\n reading surface and bed slope computation model data:\n"); - model->AddFormulation(fid,SlopeComputeAnalysisEnum()); + model->AddFormulation(fid,SlopecomputeAnalysisEnum()); _printf_("\n reading prognositc model data:\n"); Index: /issm/trunk/src/c/parallel/transient_core_2d.cpp =================================================================== --- /issm/trunk/src/c/parallel/transient_core_2d.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/transient_core_2d.cpp (revision 3086) @@ -70,5 +70,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); fem_p=model->GetFormulation(PrognosticAnalysisEnum()); Index: /issm/trunk/src/c/parallel/transient_core_3d.cpp =================================================================== --- /issm/trunk/src/c/parallel/transient_core_3d.cpp (revision 3085) +++ /issm/trunk/src/c/parallel/transient_core_3d.cpp (revision 3086) @@ -74,5 +74,5 @@ fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum()); fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum()); - fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum()); + fem_sl=model->GetFormulation(SlopecomputeAnalysisEnum()); fem_p=model->GetFormulation(PrognosticAnalysisEnum()); fem_t=model->GetFormulation(ThermalAnalysisEnum()); Index: /issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp =================================================================== --- /issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp (revision 3085) +++ /issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp (revision 3086) @@ -44,5 +44,5 @@ } } - else if (analysis_type==SlopeComputeAnalysisEnum()){ + else if (analysis_type==SlopecomputeAnalysisEnum()){ numdofs=1; }