Changeset 8404


Ignore:
Timestamp:
05/24/11 09:21:21 (14 years ago)
Author:
seroussi
Message:

changed PenaltyConstraints to ConstraintsState

Location:
issm/trunk/src
Files:
10 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/Makefile.am

    r8376 r8404  
    630630                                        ./modules/SystemMatricesx/SystemMatricesx.cpp\
    631631                                        ./modules/SystemMatricesx/SystemMatricesx.h\
    632                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
    633                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
    634                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsLocal.h\
    635                                         ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
    636                                         ./modules/PenaltyConstraintsx/MeltingConstraints.cpp\
    637                                         ./modules/PenaltyConstraintsx/MeltingIsPresent.cpp\
     632                                        ./modules/ConstraintsStatex/ConstraintsStatex.cpp\
     633                                        ./modules/ConstraintsStatex/ConstraintsStatex.h\
     634                                        ./modules/ConstraintsStatex/ConstraintsStateLocal.h\
     635                                        ./modules/ConstraintsStatex/RiftConstraintsState.cpp\
     636                                        ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\
     637                                        ./modules/ConstraintsStatex/MeltingIsPresent.cpp\
    638638                                        ./modules/Responsex/Responsex.h\
    639639                                        ./modules/Responsex/Responsex.cpp\
    … …  
    12651265                                        ./modules/SystemMatricesx/SystemMatricesx.cpp\
    12661266                                        ./modules/SystemMatricesx/SystemMatricesx.h\
    1267                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
    1268                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
    1269                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsLocal.h\
    1270                                         ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
    1271                                         ./modules/PenaltyConstraintsx/MeltingConstraints.cpp\
    1272                                         ./modules/PenaltyConstraintsx/MeltingIsPresent.cpp\
     1267                                        ./modules/ConstraintsStatex/ConstraintsStatex.cpp\
     1268                                        ./modules/ConstraintsStatex/ConstraintsStatex.h\
     1269                                        ./modules/ConstraintsStatex/ConstraintsStateLocal.h\
     1270                                        ./modules/ConstraintsStatex/RiftConstraintsState.cpp\
     1271                                        ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\
     1272                                        ./modules/ConstraintsStatex/MeltingIsPresent.cpp\
    12731273                                        ./modules/Responsex/Responsex.h\
    12741274                                        ./modules/Responsex/Responsex.cpp\

  • issm/trunk/src/c/modules/modules.h

    r8385 r8404  
    7777#include "./OutputResultsx/OutputResultsx.h"
    7878#include "./OutputRiftsx/OutputRiftsx.h"
    79 #include "./PenaltyConstraintsx/PenaltyConstraintsx.h"
     79#include "./ConstraintsStatex/ConstraintsStatex.h"
    8080#include "./PointCloudFindNeighborsx/PointCloudFindNeighborsx.h"
    8181#include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"

  • issm/trunk/src/c/solvers/solver_nonlinear.cpp

    r7637 r8404  
    6969                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    7070
    71                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
     71                ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
    7272                _printf_(VerboseConvergence(),"   number of unstable constraints: %i\n",num_unstable_constraints);
    7373

  • issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

    r7391 r8404  
    7070                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,tg);
    7171
    72                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
     72                ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    7373
    7474                if (!converged){

  • issm/trunk/src/m/classes/clusters/pfe.m

    r7629 r8404  
    119119
    120120                         fprintf(fid,'#PBS -S /bin/bash\n');
    121                          fprintf(fid,'#PBS -N %s\n',modelname);
     121%                        fprintf(fid,'#PBS -N %s\n',modelname);
    122122                         fprintf(fid,'#PBS -l select=%i:ncpus=%i:model=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor);
    123123                         fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds.

  • issm/trunk/src/m/solvers/solver_nonlinear.m

    r8397 r8404  
    4242
    4343                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);
    44                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters);
     44                [loads,constraints_converged,num_unstable_constraints] =ConstraintsState( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters);
    4545
    4646                issmprintf(VerboseConvergence(),'%s%i','      number of unstable constraints: ',num_unstable_constraints);

  • issm/trunk/src/m/solvers/solver_thermal_nonlinear.m

    r7391 r8404  
    3939
    4040                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);
    41                 [femmodel.loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters);
     41                [femmodel.loads,constraints_converged,num_unstable_constraints] =ConstraintsState(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters);
    4242       
    4343                if ~converged,

  • issm/trunk/src/mex/Makefile.am

    r8330 r8404  
    5353                                OutputResults\
    5454                                ParsePetscOptions\
    55                                 PenaltyConstraints\
     55                                ConstraintsState\
    5656                                PointCloudFindNeighbors\
    5757                                PropagateFlagsFromConnectivity\
    … …  
    251251                          OutputResults/OutputResults.h
    252252
    253 PenaltyConstraints_SOURCES = PenaltyConstraints/PenaltyConstraints.cpp\
    254                           PenaltyConstraints/PenaltyConstraints.h
     253ConstraintsState_SOURCES = ConstraintsState/ConstraintsState.cpp\
     254                          ConstraintsState/ConstraintsState.h
    255255
    256256PointCloudFindNeighbors_SOURCES = PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
Note: See TracChangeset for help on using the changeset viewer.