Index: sm/trunk/src/c/EnumDefinitions/AnalysisTypeAsEnum.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/AnalysisTypeAsEnum.cpp (revision 1900) +++ (revision ) @@ -1,87 +1,0 @@ -/* \file AnalysisTypeAsEnum.cpp - * \brief get integer enum instead of a string - */ - -#include "./EnumDefinitions.h" -#include "../shared/shared.h" - -#undef __FUNCT__ -#define __FUNCT__ "AnalysisTypeAsEnum" - -int AnalysisTypeAsEnum(char* analysis_type){ - - if (analysis_type==NULL){ - throw ErrorException(__FUNCT__," analysis_type is NULL"); - } - - if (strcmp(analysis_type,"diagnostic")==0){ - return DiagnosticAnalysisEnum(); - } - else if (strcmp(analysis_type,"control")==0){ - return ControlAnalysisEnum(); - } - else if (strcmp(analysis_type,"thermal")==0){ - return ThermalAnalysisEnum(); - } - else if (strcmp(analysis_type,"prognostic")==0){ - return PrognosticAnalysisEnum(); - } - else if (strcmp(analysis_type,"melting")==0){ - return MeltingAnalysisEnum(); - } - else if (strcmp(analysis_type,"slope_compute")==0){ - return SlopeComputeAnalysisEnum(); - } - else if (strcmp(analysis_type,"stokes")==0){ - return StokesAnalysisEnum(); - } - else if (strcmp(analysis_type,"hutter")==0){ - return HutterAnalysisEnum(); - } - else if (strcmp(analysis_type,"surfacex")==0){ - return SurfaceXAnalysisEnum(); - } - else if (strcmp(analysis_type,"surfacey")==0){ - return SurfaceYAnalysisEnum(); - } - else if (strcmp(analysis_type,"bedx")==0){ - return BedXAnalysisEnum(); - } - else if (strcmp(analysis_type,"bedy")==0){ - return BedYAnalysisEnum(); - } - else if (strcmp(analysis_type,"horiz")==0){ - return HorizAnalysisEnum(); - } - else if (strcmp(analysis_type,"vert")==0){ - return VertAnalysisEnum(); - } - else if (strcmp(analysis_type,"steady")==0){ - return SteadyAnalysisEnum(); - } - else if (strcmp(analysis_type,"transient")==0){ - return TransientAnalysisEnum(); - } - else if (strcmp(analysis_type,"steadystate")==0){ - return SteadystateAnalysisEnum(); - } - else if (strcmp(analysis_type,"none")==0){ - return NoneAnalysisEnum(); - } - else if (strcmp(analysis_type,"inverse")==0){ - return InverseAnalysisEnum(); - } - else if (strcmp(analysis_type,"adjoint")==0){ - return AdjointAnalysisEnum(); - } - else if (strcmp(analysis_type,"gradient")==0){ - return GradientAnalysisEnum(); - } - else if (strcmp(analysis_type,"")==0){ - return NoneAnalysisEnum(); - } - else throw ErrorException(__FUNCT__,exprintf("%s%s"," could not recognize analysis type: ",analysis_type)); - -} - - Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp (revision 1900) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp (revision 1901) @@ -31,6 +31,6 @@ //thermal int ThermalAnalysisEnum(void){ return 230; } -int SteadyAnalysisEnum(void){ return 231; } -int TransientAnalysisEnum(void){ return 232; } +//transient +int TransientAnalysisEnum(void){ return 231; } //slope int SlopeComputeAnalysisEnum(void){ return 240; } Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 1900) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 1901) @@ -32,7 +32,6 @@ //thermal int ThermalAnalysisEnum(void); -int SteadyAnalysisEnum(void); +//transient int TransientAnalysisEnum(void); -int ThermalstaticAnalysisEnum(void); //slope int SlopeComputeAnalysisEnum(void); @@ -109,4 +108,3 @@ int EnumIsLoad(int en); int EnumIsMaterial(int en); -int AnalysisTypeAsEnum(char* analysis_type); #endif Index: /issm/trunk/src/c/EnumDefinitions/SynchronizeMatlabEnum.sh =================================================================== --- /issm/trunk/src/c/EnumDefinitions/SynchronizeMatlabEnum.sh (revision 1900) +++ /issm/trunk/src/c/EnumDefinitions/SynchronizeMatlabEnum.sh (revision 1901) @@ -3,4 +3,7 @@ #Create a matlab file using the same Enum as in EnumDefinitions.cpp #and move the file to src/m/enum + +#first remove all existing enum +rm $ISSM_DIR/src/m/enum/*.m #Get the list of interesting lines of EnumDefinitions.cpp and introduce line number Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 1900) +++ /issm/trunk/src/c/Makefile.am (revision 1901) @@ -180,5 +180,4 @@ ./EnumDefinitions/EnumDefinitions.h\ ./EnumDefinitions/EnumDefinitions.cpp\ - ./EnumDefinitions/AnalysisTypeAsEnum.cpp\ ./ModelProcessorx/IoModel.h\ ./ModelProcessorx/IoModel.cpp\ @@ -475,5 +474,4 @@ ./EnumDefinitions/EnumDefinitions.h\ ./EnumDefinitions/EnumDefinitions.cpp\ - ./EnumDefinitions/AnalysisTypeAsEnum.cpp\ ./ModelProcessorx/IoModel.h\ ./ModelProcessorx/IoModel.cpp\ Index: /issm/trunk/src/c/ModelProcessorx/Melting/CreateParametersMelting.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Melting/CreateParametersMelting.cpp (revision 1900) +++ /issm/trunk/src/c/ModelProcessorx/Melting/CreateParametersMelting.cpp (revision 1901) @@ -28,5 +28,5 @@ /* get initial melting if transient*/ - if(iomodel->sub_analysis_type==TransientAnalysisEnum()){ + if(iomodel->dt){ /*Get melting: */ Index: /issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp (revision 1900) +++ /issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp (revision 1901) @@ -66,5 +66,5 @@ /* get initial temperature and melting if transient*/ - if(iomodel->sub_analysis_type==TransientAnalysisEnum()){ + if(iomodel->dt){ /*Get melting and temperature: */ Index: /issm/trunk/src/c/objects/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Pengrid.cpp (revision 1900) +++ /issm/trunk/src/c/objects/Pengrid.cpp (revision 1901) @@ -482,5 +482,5 @@ found=inputs->Recover("dt",&dt); - if((!found) && (sub_analysis_type==TransientAnalysisEnum()))throw ErrorException(__FUNCT__," could not find dt in inputs!"); + if(!found)throw ErrorException(__FUNCT__," could not find dt in inputs!"); meltingpoint=matpar->GetMeltingPoint(); @@ -500,9 +500,9 @@ } else{ - if (sub_analysis_type==SteadyAnalysisEnum()){ - P_terms[0]=melting_offset*pow((double)10,penalty_offset)*(temperature-t_pmp); + if (dt){ + P_terms[0]=melting_offset*pow((double)10,penalty_offset)*(temperature-t_pmp)/dt; } else{ - P_terms[0]=melting_offset*pow((double)10,penalty_offset)*(temperature-t_pmp)/dt; + P_terms[0]=melting_offset*pow((double)10,penalty_offset)*(temperature-t_pmp); } } Index: /issm/trunk/src/c/objects/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Penta.cpp (revision 1900) +++ /issm/trunk/src/c/objects/Penta.cpp (revision 1901) @@ -3508,5 +3508,5 @@ D_scalar=gauss_weight*Jdet*(thermalconductivity/(rho_ice*heatcapacity)); - if(sub_analysis_type!=SteadyAnalysisEnum()){ + if(dt){ D_scalar=D_scalar*dt; } @@ -3533,5 +3533,5 @@ D_scalar=gauss_weight*Jdet; - if(sub_analysis_type!=SteadyAnalysisEnum()){ + if(dt){ D_scalar=D_scalar*dt; } @@ -3546,5 +3546,5 @@ /*Transient: */ - if(sub_analysis_type!=SteadyAnalysisEnum()){ + if(dt){ GetNodalFunctions(&L[0], gauss_coord); D_scalar=gauss_weight*Jdet; @@ -3567,5 +3567,5 @@ /*Build K: */ D_scalar=gauss_weight*Jdet/(pow(u,2)+pow(v,2)+epsvel); - if(sub_analysis_type!=SteadyAnalysisEnum()){ + if(dt){ D_scalar=D_scalar*dt; } @@ -3870,9 +3870,8 @@ found=inputs->Recover("velocity",&vxvyvz_list[0][0],3,dofs,numgrids,(void**)nodes); if(!found)throw ErrorException(__FUNCT__," could not find velocity in inputs!"); - - if(sub_analysis_type==TransientAnalysisEnum()){ - found=inputs->Recover("dt",&dt); - if(!found)throw ErrorException(__FUNCT__," could not find dt in inputs!"); - + found=inputs->Recover("dt",&dt); + if(!found)throw ErrorException(__FUNCT__," could not find dt in inputs!"); + + if(dt){ found=inputs->Recover("temperature",&temperature_list[0],1,dofs1,numgrids,(void**)nodes); if(!found)throw ErrorException(__FUNCT__," could not find temperature in inputs!"); @@ -3920,9 +3919,7 @@ /*Build pe_gaussian */ - if(sub_analysis_type==SteadyAnalysisEnum()){ - scalar_def=phi/(rho_ice*heatcapacity)*Jdet*gauss_weight; - } - else{ - scalar_def=dt*phi/(rho_ice*heatcapacity)*Jdet*gauss_weight; + scalar_def=phi/(rho_ice*heatcapacity)*Jdet*gauss_weight; + if(dt){ + scalar_def=scalar_def*dt; } @@ -3932,5 +3929,5 @@ /* Build transient now */ - if(sub_analysis_type==TransientAnalysisEnum()){ + if(dt){ GetParameterValue(&temperature, &temperature_list[0],gauss_coord); scalar_transient=temperature*Jdet*gauss_weight; Index: /issm/trunk/src/c/objects/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Tria.cpp (revision 1900) +++ /issm/trunk/src/c/objects/Tria.cpp (revision 1901) @@ -3359,5 +3359,5 @@ /*Calculate DL on gauss point */ D_scalar=gauss_weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_velocity/(heatcapacity*rho_ice); - if(sub_analysis_type!=SteadyAnalysisEnum()){ + if(dt){ D_scalar=dt*D_scalar; } @@ -3537,6 +3537,5 @@ /*recover extra inputs from users, dt and velocity: */ found=inputs->Recover("dt",&dt); - if((!found) && (sub_analysis_type==TransientAnalysisEnum()))throw ErrorException(__FUNCT__," could not find dt in inputs!"); - + if(!found)throw ErrorException(__FUNCT__," could not find dt in inputs!"); found=inputs->Recover("pressure",&pressure_list[0],1,dofs1,numgrids,(void**)nodes); if(!found)throw ErrorException(__FUNCT__," could not find pressure in inputs!"); @@ -3565,5 +3564,5 @@ /*Calculate scalar parameter*/ scalar_ocean=gauss_weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_velocity*t_pmp/(heatcapacity*rho_ice); - if(sub_analysis_type==TransientAnalysisEnum()){ + if(dt){ scalar_ocean=dt*scalar_ocean; } @@ -3646,5 +3645,5 @@ /*recover extra inputs from users, dt and velocity: */ found=inputs->Recover("dt",&dt); - if((!found) && (sub_analysis_type==TransientAnalysisEnum()))throw ErrorException(__FUNCT__," could not find dt in inputs!"); + if(!found)throw ErrorException(__FUNCT__," could not find dt in inputs!"); found=inputs->Recover("velocity",&vxvyvz_list[0][0],3,dofs,numgrids,(void**)nodes); @@ -3708,5 +3707,5 @@ /*Calculate scalar parameter*/ scalar=gauss_weight*Jdet*(basalfriction+geothermalflux_value)/(heatcapacity*rho_ice); - if(sub_analysis_type==TransientAnalysisEnum()){ + if(dt){ scalar=dt*scalar; } Index: /issm/trunk/src/c/parallel/steadystate.cpp =================================================================== --- /issm/trunk/src/c/parallel/steadystate.cpp (revision 1900) +++ /issm/trunk/src/c/parallel/steadystate.cpp (revision 1901) @@ -85,7 +85,7 @@ _printf_("\n read and create thermal finite element model:\n"); - model->AddFormulation(fid,ThermalAnalysisEnum(),SteadyAnalysisEnum()); + model->AddFormulation(fid,ThermalAnalysisEnum()); _printf_("\n read and create melting finite element model:\n"); - model->AddFormulation(fid,MeltingAnalysisEnum(),SteadyAnalysisEnum()); + model->AddFormulation(fid,MeltingAnalysisEnum()); /*recover parameters: */ Index: /issm/trunk/src/c/parallel/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/thermal_core.cpp (revision 1900) +++ /issm/trunk/src/c/parallel/thermal_core.cpp (revision 1901) @@ -56,5 +56,5 @@ fem_t->FindParam((void*)&ndt,"ndt"); - if(sub_analysis_type==SteadyAnalysisEnum()){ + if(ndt==0){ time=(double*)xmalloc(sizeof(double)); @@ -66,10 +66,10 @@ if(debug)_printf_("computing temperatures:\n"); - thermal_core_nonlinear(&t_g[0],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),SteadyAnalysisEnum()); + thermal_core_nonlinear(&t_g[0],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum()); inputs->Add("temperature",t_g[0],1,numberofnodes); inputs->Add("melting_offset",melting_offset); if(debug)_printf_("computing melting:\n"); - diagnostic_core_linear(&m_g[0],fem_m,inputs,MeltingAnalysisEnum(),SteadyAnalysisEnum()); + diagnostic_core_linear(&m_g[0],fem_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum()); } else{ @@ -97,15 +97,15 @@ if(debug)_printf_("computing temperatures:\n"); inputs->Add("temperature",t_g[i],1,numberofnodes); - thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),TransientAnalysisEnum()); + thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum()); if(debug)_printf_("computing melting:\n"); inputs->Add("temperature",t_g[i+1],1,numberofnodes); inputs->Add("melting_offset",melting_offset); - diagnostic_core_linear(&m_g[i+1],fem_m,inputs,MeltingAnalysisEnum(),TransientAnalysisEnum()); + diagnostic_core_linear(&m_g[i+1],fem_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum()); } } /*Plug results into output dataset: */ - if(sub_analysis_type==SteadyAnalysisEnum()){ + if(ndt==0){ result=new Result(results->Size()+1,0,1,"t_g",t_g[0]); results->AddObject(result); Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m (revision 1900) +++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m (revision 1901) @@ -233,4 +233,9 @@ %STEADYSTATE if md.analysis_type==SteadystateAnalysisEnum, + %NDT + if md.dt~=0, + disp(['For a steadystate computation, ndt must be zero.']); + bool=0;return; + end %PRESSURE if isnans(md.pressure), @@ -250,7 +255,4 @@ bool=0;return; end - - - end @@ -276,5 +278,5 @@ %THERMAL TRANSIENT -if md.analysis_type==ThermalAnalysisEnum & md.sub_analysis_type==TransientAnalysisEnum, +if md.analysis_type==ThermalAnalysisEnum & md.dt~=0 %DT and NDT Index: /issm/trunk/src/m/classes/public/process_solve_options.m =================================================================== --- /issm/trunk/src/m/classes/public/process_solve_options.m (revision 1900) +++ /issm/trunk/src/m/classes/public/process_solve_options.m (revision 1901) @@ -51,7 +51,4 @@ disp('recover_solve_options info message: no ''sub_analysis_type'' was provided, defaulting to ''inverse'''); sub_analysis_type='inverse'; - elseif strcmpi(analysis_type,'thermal'), - disp('recover_solve_options info message: no ''sub_analysis_type'' was provided, defaulting to ''steady'''); - sub_analysis_type='steady'; else sub_analysis_type='none'; @@ -79,5 +76,5 @@ analysis_type=eval([upper(analysis_type(1)) lower(analysis_type(2:end)) 'AnalysisEnum']); end -if ~ismemberi(sub_analysis_type,{'none','steady','horiz','adjoint','gradient','inverse','vert','','transient'}), +if ~ismemberi(sub_analysis_type,{'none','horiz','adjoint','gradient','inverse','vert',''}), error(['process_solve_options error message: sub_analysis_type ' sub_analysis_type ' not supported yet!']); else Index: /issm/trunk/src/m/enum/AnalysisTypeFromEnum.m =================================================================== --- /issm/trunk/src/m/enum/AnalysisTypeFromEnum.m (revision 1900) +++ /issm/trunk/src/m/enum/AnalysisTypeFromEnum.m (revision 1901) @@ -57,8 +57,4 @@ end -if enum==SteadyAnalysisEnum(), - string='steady'; -end - if enum==TransientAnalysisEnum(), string='transient'; Index: /issm/trunk/src/m/enum/TransientAnalysisEnum.m =================================================================== --- /issm/trunk/src/m/enum/TransientAnalysisEnum.m (revision 1900) +++ /issm/trunk/src/m/enum/TransientAnalysisEnum.m (revision 1901) @@ -7,3 +7,3 @@ % macro=TransientAnalysisEnum() -macro=232; +macro=231; Index: /issm/trunk/src/m/solutions/cielo/control.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/control.m (revision 1900) +++ /issm/trunk/src/m/solutions/cielo/control.m (revision 1901) @@ -28,8 +28,8 @@ displaystring(md.debug,'\n%s',['reading thermal model data']); - md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=SteadyAnalysisEnum(); models.t=CreateFemModel(md); + md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.t=CreateFemModel(md); displaystring(md.debug,'\n%s',['reading melting model data']); - md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=SteadyAnalysisEnum(); models.m=CreateFemModel(md); + md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.m=CreateFemModel(md); Index: /issm/trunk/src/m/solutions/cielo/steadystate.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/steadystate.m (revision 1900) +++ /issm/trunk/src/m/solutions/cielo/steadystate.m (revision 1901) @@ -29,8 +29,8 @@ %Build all models requested for thermal simulation displaystring(md.debug,'%s',['reading thermal model data']); - md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=SteadyAnalysisEnum(); models.t=CreateFemModel(md); + md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.t=CreateFemModel(md); displaystring(md.debug,'%s',['reading melting model data']); - md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=SteadyAnalysisEnum(); models.m=CreateFemModel(md); + md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.m=CreateFemModel(md); % figure out number of dof: just for information purposes. Index: /issm/trunk/src/m/solutions/cielo/thermal_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 1900) +++ /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 1901) @@ -9,5 +9,5 @@ m_m=models.m; -if m_t.parameters.sub_analysis_type==SteadyAnalysisEnum(), +if m_t.parameters.dt==0, results.time=0; @@ -15,10 +15,10 @@ displaystring(m_t.parameters.debug,'\n%s',['computing temperatures...']); - [results.t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),SteadyAnalysisEnum()); + [results.t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum()); displaystring(m_t.parameters.debug,'\n%s',['computing melting...']); inputs=add(inputs,'melting_offset',melting_offset,'double'); inputs=add(inputs,'temperature',results.t_g,'doublevec',1,m_t.parameters.numberofnodes); - results.m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),SteadyAnalysisEnum()); + results.m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum()); else @@ -43,10 +43,10 @@ displaystring(m_t.parameters.debug,'\n%s',[' computing temperatures...']); inputs=add(inputs,'temperature',results(n).t_g,'doublevec',1,m_t.parameters.numberofnodes); - [results(n+1).t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),TransientAnalysisEnum()); + [results(n+1).t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum()); displaystring(m_t.parameters.debug,'\n%s',[' computing melting...']); inputs=add(inputs,'temperature',results(n+1).t_g,'doublevec',1,m_t.parameters.numberofnodes); inputs=add(inputs,'melting_offset',melting_offset,'double'); - results(n+1).m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),TransientAnalysisEnum()); + results(n+1).m_g=diagnostic_core_linear(m_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum()); end Index: /issm/trunk/src/m/utils/Nightly/testsgetanalysis.m =================================================================== --- /issm/trunk/src/m/utils/Nightly/testsgetanalysis.m (revision 1900) +++ /issm/trunk/src/m/utils/Nightly/testsgetanalysis.m (revision 1901) @@ -23,9 +23,9 @@ elseif strcmpi(string,'thermalsteady'), analysis_type='thermal'; - sub_analysis_type='steady'; + sub_analysis_type='none'; elseif strcmpi(string,'thermaltransient'), analysis_type='thermal'; - sub_analysis_type='transient'; + sub_analysis_type='none'; elseif strcmpi(string,'transient'),