Changeset 3839


Ignore:
Timestamp:
05/19/10 09:57:00 (15 years ago)
Author:
seroussi
Message:

no inputs in arguments

Location:
issm/trunk/src/m/solutions/jpl
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/solutions/jpl/ControlInitialization.m

    r3799 r3839  
    1 function [inputs models]=ControlInitialization(models,inputs);
     1function models=ControlInitialization(models);
    22
    33%recover models
     
    5555% get pressure (reconditionned) and create 4d u_g
    5656displaystring(verbose,'\n%s',['computing pressure according to Pattyn...']);
    57 p_g=ComputePressure(m_dh.elements,m_dh.nodes,mdh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
     57p_g=ComputePressure(m_dh.elements,m_dh.nodes,mdh.vertices,m_dh.loads,m_dh.materials,m_dh.parameters,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
    5858p_g=p_g/m_ds.parameters.stokesreconditioning;
    5959u_g_stokes=zeros(m_ds.nodesets.gsize,1);
  • issm/trunk/src/m/solutions/jpl/SpawnCore.m

    r3796 r3839  
    1 function responses=SpawnCore(models,inputs,variables,variabledescriptors,analysis_type,sub_analysis_type,counter);
     1function responses=SpawnCore(models,variables,variabledescriptors,analysis_type,sub_analysis_type,counter);
    22%SPAWNCORE - for Qmu analysis, using Dakota. Spawn the core solution.
    33%
    44%   Usage:
    5 %      responses=SpawnCore(models,inputs,variables,variabledescriptors)
     5%      responses=SpawnCore(models,variables,variabledescriptors)
    66%
    77
     
    4747if analysis_type==DiagnosticAnalysisEnum(),
    4848
    49         results=diagnostic_core(models,inputs);
     49        results=diagnostic_core(models);
    5050
    5151else
  • issm/trunk/src/m/solutions/jpl/balancedthickness.m

    r3796 r3839  
    2525
    2626        displaystring(md.verbose,'\n%s',['call computational core:']);
    27         results=balancedthickness_core(models,inputs,BalancedthicknessAnalysisEnum(),NoneAnalysisEnum());
     27        results=balancedthickness_core(models,BalancedthicknessAnalysisEnum(),NoneAnalysisEnum());
    2828
    2929        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/balancedthickness2.m

    r3796 r3839  
    2828
    2929        displaystring(md.verbose,'\n%s',['call computational core:']);
    30         results=balancedthickness2_core(models,inputs,Balancedthickness2AnalysisEnum(),NoneAnalysisEnum());
     30        results=balancedthickness2_core(models,Balancedthickness2AnalysisEnum(),NoneAnalysisEnum());
    3131
    3232        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/balancedthickness2_core.m

    r3799 r3839  
    1 function results=balancedthickness2_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=balancedthickness2_core(models,analysis_type,sub_analysis_type)
    22%BALANCEDTHICKNESS_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      h_g=balancedthickness2_core(m,inputs,analysis_type,sub_analysis_type)
     5%      h_g=balancedthickness2_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/balancedthickness_core.m

    r3799 r3839  
    1 function results=balancedthickness_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=balancedthickness_core(models,analysis_type,sub_analysis_type)
    22%BALANCEDTHICKNESS_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      h_g=balancedthickness_core(m,inputs,analysis_type,sub_analysis_type)
     5%      h_g=balancedthickness_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/balancedvelocities.m

    r3796 r3839  
    2727
    2828        displaystring(md.verbose,'\n%s',['call computational core:']);
    29         results=balancedvelocities_core(models,inputs,BalancedvelocitiesAnalysisEnum(),NoneAnalysisEnum());
     29        results=balancedvelocities_core(models,BalancedvelocitiesAnalysisEnum(),NoneAnalysisEnum());
    3030
    3131        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/balancedvelocities_core.m

    r3799 r3839  
    1 function results=balancedvelocities_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=balancedvelocities_core(models,analysis_type,sub_analysis_type)
    22%BALANCEDVELOCITIES_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      v_g=balancedvelocities_core(m,inputs,analysis_type,sub_analysis_type)
     5%      v_g=balancedvelocities_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/control_core.m

    r3796 r3839  
    1 function results=control_core(models,inputs)
     1function results=control_core(models)
    22%CONTROL_CORE - compute the core inversion
    33%
    44%   Usage:
    5 %      results=control_core(models,inputs);
     5%      results=control_core(models);
    66%
    77
    88%Preprocess models
    9 [inputs models]=ControlInitialization(models,inputs);
     9models=ControlInitialization(models);
    1010
    1111%recover active model.
     
    3737        %In case we are running a steady state control method, compute new temperature field using new parameter distribution:
    3838        if model.parameters.ControlSteady;
    39                 steadystate_results=steadystate_core(models,inputs); t_g=steadystate_results.t_g;
     39                steadystate_results=steadystate_core(models); t_g=steadystate_results.t_g;
    4040                inputs=add(inputs,'temperature',t_g,'doublevec',1,model.parameters.NumberOfNodes);
    4141        end
     
    4646
    4747        %Update inputs in datasets
    48         [model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters]=UpdateFromInputs(model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters,inputs);
     48        [model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters]=UpdateFromInputs(model.elements,model.nodes,model.vertices,model.loads,model.materials,model.parameters);
    4949
    5050        displaystring(verbose,'\n%s',['      computing gradJ...']);
    51         results_grad=gradjcompute_core(models,inputs);
     51        results_grad=gradjcompute_core(models);
    5252        u_g=results_grad.u_g; c(n).grad_g=results_grad.grad_g;
    5353        if dim==3,
     
    7878
    7979        displaystring(verbose,'\n%s',['      optimizing along gradient direction...']);
    80         [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,models,inputs,param_g,c(n).grad_g,n,model.parameters);
     80        [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,models,param_g,c(n).grad_g,n,model.parameters);
    8181
    8282        displaystring(verbose,'\n%s',['      updating parameter using optimized search scalar...']);
     
    119119if model.parameters.ControlSteady;
    120120        inputs=add(inputs,model.parameters.ControlType,param_g,'doublevec',1,model.parameters.NumberOfNodes);
    121         steadystate_results=steadystate_core(models,inputs); t_g=steadystate_results.t_g;
     121        steadystate_results=steadystate_core(models); t_g=steadystate_results.t_g;
    122122        u_g=steadystate_results.u_g;
    123123        t_g=steadystate_results.t_g;
     
    125125else
    126126        inputs=add(inputs,model.parameters.ControlType,param_g,'doublevec',1,model.parameters.NumberOfNodes);
    127         results_diag=diagnostic_core(models,inputs);
     127        results_diag=diagnostic_core(models);
    128128        u_g=results_diag.u_g;
    129129end
  • issm/trunk/src/m/solutions/jpl/diagnostic_core_linear.m

    r3838 r3839  
    99
    1010        %Update inputs in datasets
    11         [m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs);
     11        [m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters);
    1212       
    1313        %system matrices
    14         [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
    15         [K_gg, p_g,kmax]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     14        [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
     15        [K_gg, p_g,kmax]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    1616       
    1717        %Reduce tangent matrix from g size to f size
  • issm/trunk/src/m/solutions/jpl/diagnostic_core_nonlinear.m

    r3837 r3839  
    3434       
    3535                %penalties
    36                 [K_gg , p_g, kmax]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     36                [K_gg , p_g, kmax]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    3737
    3838                %Reduce tangent matrix from g size to f size
     
    5858               
    5959                %penalty constraints
    60                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     60                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,analysis_type,sub_analysis_type);
    6161                error;
    6262               
     
    6666                converged=convergence(K_ff,p_f,soln(count).u_f,soln(count-1).u_f,m.parameters);
    6767                       
    68                 %add convergence status into inputs
     68                %add convergence status into
    6969                inputs=add(inputs,'converged',converged,'double');
    7070
     
    8585                inputs=add(inputs,'velocity',u_g,'doublevec',m.parameters.NumberOfDofsPerNode,m.parameters.NumberOfNodes);
    8686                m.parameters.Kflag=1; m.parameters.Pflag=0;
    87                 [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     87                [K_gg, p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    8888                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, m.Gmn, m.nodesets);
    8989                varargout(1)={K_ff};
  • issm/trunk/src/m/solutions/jpl/gradjcompute_core.m

    r3799 r3839  
    1 function results=gradjcompute_core(models,inputs);
     1function results=gradjcompute_core(models);
    22
    33%recover active models
     
    2121%Buid Du, difference between observed velocity and model velocity.
    2222displaystring(verbose,'%s','          computing Du...');
    23 [Du_g]=Du(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     23[Du_g]=Du(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    2424
    2525%Reduce adjoint load from g-set to f-set
     
    3535
    3636%Compute gradJ
    37 grad_g=Gradj(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     37grad_g=Gradj(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    3838if (dim==3 & extrude_param),
    3939        displaystring(verbose,'%s','          extruding gradient...');
     
    4444        %compute initial velocity from diagnostic_core (horiz+vertical)
    4545        displaystring(verbose,'%s','          compute 3d initial velocity...');
    46         results_diag=diagnostic_core(models,inputs);
     46        results_diag=diagnostic_core(models);
    4747        u_g=results_diag.u_g;
    4848end
  • issm/trunk/src/m/solutions/jpl/objectivefunctionC.m

    r3799 r3839  
    1 function J =objectivefunctionC(search_scalar,models,inputs,p_g,grad_g,n,analysis_type,sub_analysis_type);
     1function J =objectivefunctionC(search_scalar,models,p_g,grad_g,n,analysis_type,sub_analysis_type);
    22
    33%recover active model.
     
    2323
    2424%Compute misfit for this velocity field.
    25 J=CostFunction(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     25J=CostFunction(m.elements,m.nodes,m.vertices,m.loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
  • issm/trunk/src/m/solutions/jpl/prognostic.m

    r3796 r3839  
    2727
    2828        displaystring(md.verbose,'\n%s',['call computational core:']);
    29         results=prognostic_core(models,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
     29        results=prognostic_core(models,PrognosticAnalysisEnum(),NoneAnalysisEnum());
    3030
    3131        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/prognostic2.m

    r3534 r3839  
    2828
    2929        displaystring(md.verbose,'\n%s',['call computational core:']);
    30         results=prognostic2_core(models,inputs,Prognostic2AnalysisEnum(),NoneAnalysisEnum());
     30        results=prognostic2_core(models,Prognostic2AnalysisEnum(),NoneAnalysisEnum());
    3131
    3232        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/prognostic2_core.m

    r3799 r3839  
    1 function results=prognostic2_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=prognostic2_core(models,analysis_type,sub_analysis_type)
    22%PROGNOSTIC2_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      h_g=prognostic2_core(m,inputs,analysis_type,sub_analysis_type)
     5%      h_g=prognostic2_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/prognostic_core.m

    r3799 r3839  
    1 function results=prognostic_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=prognostic_core(models,analysis_type,sub_analysis_type)
    22%PROGNOSTIC_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      h_g=prognostic_core(m,inputs,analysis_type,sub_analysis_type)
     5%      h_g=prognostic_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/slopecompute.m

    r3552 r3839  
    1717        md.dof=modelsize(models);
    1818
    19         %initialize inputs
    20         inputs=inputlist;
    21 
    2219        %compute solution
    2320        displaystring(md.verbose,'\n%s',['call computational core:']);
    24         results=slopecompute_core(models,inputs,SlopecomputeAnalysisEnum(),NoneAnalysisEnum());
     21        results=slopecompute_core(models,SlopecomputeAnalysisEnum(),NoneAnalysisEnum());
    2522
    2623        displaystring(md.verbose,'\n%s',['load results...']);
  • issm/trunk/src/m/solutions/jpl/slopecompute_core.m

    r3799 r3839  
    1 function results=slopecompute_core(models,inputs,analysis_type,sub_analysis_type)
     1function results=slopecompute_core(models,analysis_type,sub_analysis_type)
    22%SLOPECOMPUTE_CORE - linear solution sequence
    33%
    44%   Usage:
    5 %      [sx_g sy_g]=slopecompute_core(m,inputs,analysis_type,sub_analysis_type)
     5%      [sx_g sy_g]=slopecompute_core(m,analysis_type,sub_analysis_type)
    66
    77        %get FE model
  • issm/trunk/src/m/solutions/jpl/steadystate.m

    r3796 r3839  
    5555                        models.ds.parameters.ControlSteady=1;
    5656                        %launch core of control solution.
    57                         results=control_core(models,inputs);
     57                        results=control_core(models);
    5858
    5959                        %process results
     
    6262                else,
    6363                        %launch core of steadystate solution.
    64                         results=steadystate_core(models,inputs);
     64                        results=steadystate_core(models);
    6565               
    6666                        %process results
     
    7070        else
    7171                %launch dakota driver for steadystate core solution
    72                 Qmu(models,inputs,models.dh.parameters);
     72                Qmu(models,models.dh.parameters);
    7373        end
    7474
  • issm/trunk/src/m/solutions/jpl/steadystate_core.m

    r3796 r3839  
    1 function results=steadystate_core(models,inputs);
     1function results=steadystate_core(models);
    22%STEADYSTATE_CORE - compute the core temperature and velocity field  at thermal steady state.
    33%
    44%   Usage:
    5 %      results=steadystate_core(models,inputs);
     5%      results=steadystate_core(models);
    66%
    77
     
    4242                inputs=add(inputs,'velocity',results_diagnostic.u_g,'doublevec',ndof,m_t.parameters.NumberOfNodes);
    4343        end
    44         results_thermal=thermal_core(models,inputs);
     44        results_thermal=thermal_core(models);
    4545       
    4646        %add temperature to inputs.
     
    5151       
    5252        %now compute diagnostic velocity using the steady state temperature.
    53         results_diagnostic=diagnostic_core(models,inputs);
     53        results_diagnostic=diagnostic_core(models);
    5454       
    5555        %convergence?
  • issm/trunk/src/m/solutions/jpl/thermal.m

    r3796 r3839  
    3030        if ~models.t.parameters.QmuAnalysis,
    3131                %launch core of diagnostic solution.
    32                 results=thermal_core(models,inputs);
     32                results=thermal_core(models);
    3333       
    3434                %process results
     
    3737        else
    3838                %launch dakota driver for diagnostic core solution
    39                 Qmu(models,inputs,models.t.parameters);
     39                Qmu(models,models.t.parameters);
    4040        end
    4141
  • issm/trunk/src/m/solutions/jpl/thermal_core.m

    r3799 r3839  
    1 function results=thermal_core(models,inputs)
     1function results=thermal_core(models)
    22%THERMAL_CORE - core of thermal solution
    33%
    44%   Usage:
    5 %      solution=thermal_core(models,inputs)
     5%      solution=thermal_core(models)
    66
    77%get FE model
     
    1515
    1616        displaystring(m_t.parameters.Verbose,'\n%s',['computing temperatures...']);
    17         [results.t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
     17        [results.t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,,ThermalAnalysisEnum(),NoneAnalysisEnum());
    1818
    1919        displaystring(m_t.parameters.Verbose,'\n%s',['computing melting...']);
     
    4343                displaystring(m_t.parameters.Verbose,'\n%s',['    computing temperatures...']);
    4444                inputs=add(inputs,'temperature',results(n).t_g,'doublevec',1,m_t.parameters.NumberOfNodes);
    45                 [results(n+1).t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
     45                [results(n+1).t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,ThermalAnalysisEnum(),NoneAnalysisEnum());
    4646
    4747                displaystring(m_t.parameters.Verbose,'\n%s',['    computing melting...']);
  • issm/trunk/src/m/solutions/jpl/thermal_core_nonlinear.m

    r3838 r3839  
    1 function [t_g ,loads, melting_offset]=thermal_core_nonlinear(m,inputs,analysis_type,sub_analysis_type)
     1function [t_g ,loads, melting_offset]=thermal_core_nonlinear(m,analysis_type,sub_analysis_type)
    22%THERMAL_CORE_NONLINEAR - core of thermal solution sequence.
    33%   model is return together with temperature
    44%
    55%   Usage:
    6 %      [t_g ,loads, melting_offset]=thermal_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
     6%      [t_g ,loads, melting_offset]=thermal_core_nonlinear(m,analysis_type,sub_analysis_type);
    77
    88        count=1;
     
    2020
    2121                %Update inputs in datasets
    22                 [m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters,inputs);
     22                [m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters);
    2323
    2424                %system matrices
     
    2626                        if count==1
    2727                                displaystring(m.parameters.Verbose,'%s',['   system matrices']);
    28                                 [K_gg_nopenalty, p_g_nopenalty]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     28                                [K_gg_nopenalty, p_g_nopenalty]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    2929                        end
    3030                        displaystring(m.parameters.Verbose,'%s',['   penalty system matrices']);
    31                         [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     31                        [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    3232                else
    3333                        displaystring(m.parameters.Verbose,'%s',['   system matrices']);
    34                         [K_gg , p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     34                        [K_gg , p_g]=SystemMatrices(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    3535                        displaystring(m.parameters.Verbose,'%s',['   penalty system matrices']);
    36                         [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     36                        [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,analysis_type,sub_analysis_type);
    3737                end
    3838
     
    5454                inputs=add(inputs,'temperature',t_g,'doublevec',m.parameters.NumberOfDofsPerNode,m.parameters.NumberOfNodes);
    5555                displaystring(m.parameters.Verbose,'%s',['   update inputs']);
    56                 [m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters,inputs);
     56                [m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters]=UpdateFromInputs(m.elements,m.nodes,m.vertices, loads,m.materials,m.parameters);
    5757       
    5858                %penalty constraints
    5959                displaystring(m.parameters.Verbose,'%s',['   penalty constraints']);
    60                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
     60                [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,analysis_type,sub_analysis_type);
    6161       
    6262                if ~converged,
  • issm/trunk/src/m/solutions/jpl/transient2d.m

    r3796 r3839  
    7171
    7272        %Get horizontal solution.
    73         rawresults=diagnostic_core(models,inputs);
     73        rawresults=diagnostic_core(models);
    7474        solution(n+1).u_g=rawresults.u_g; solution(n+1).p_g=rawresults.p_g;
    7575
     
    7777        disp(sprintf('%s','   computing new thickness...'));
    7878        inputs=add(inputs,'velocity',solution(n+1).u_g,'doublevec',2,models.p.parameters.NumberOfNodes);
    79         rawresults=prognostic_core(models,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
     79        rawresults=prognostic_core(models,PrognosticAnalysisEnum(),NoneAnalysisEnum());
    8080        new_thickness=rawresults.h_g;
    8181
  • issm/trunk/src/m/solutions/jpl/transient3d.m

    r3799 r3839  
    8484        %Deal with temperature first
    8585        displaystring(md.verbose,'\n%s',['    computing temperatures...']);
    86         [results(n+1).t_g models.t.loads melting_offset]=thermal_core_nonlinear(models.t,inputs,ThermalAnalysisEnum(),TransientAnalysisEnum());
     86        [results(n+1).t_g models.t.loads melting_offset]=thermal_core_nonlinear(models.t,ThermalAnalysisEnum(),TransientAnalysisEnum());
    8787        inputs=add(inputs,'temperature',results(n+1).t_g,'doublevec',1,models.t.parameters.NumberOfNodes);
    8888       
     
    9696
    9797        %Deal with velocities.
    98         rawresults=diagnostic_core(models,inputs);
     98        rawresults=diagnostic_core(models);
    9999        results(n+1).u_g=rawresults.u_g; results(n+1).p_g=rawresults.p_g;
    100100
     
    102102        displaystring(md.verbose,'\n%s',['    computing new thickness...']);
    103103        inputs=add(inputs,'velocity',results(n+1).u_g,'doublevec',3,models.p.parameters.NumberOfNodes);
    104         rawresults=prognostic_core(models,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
     104        rawresults=prognostic_core(models,PrognosticAnalysisEnum(),NoneAnalysisEnum());
    105105        new_thickness=rawresults.h_g;
    106106
Note: See TracChangeset for help on using the changeset viewer.