Changeset 6024


Ignore:
Timestamp:
09/24/10 11:20:18 (14 years ago)
Author:
seroussi
Message:

added solver for stokes coupling in parallel

Location:
issm/trunk/src/c
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Makefile.am

    r6014 r6024  
    11491149                                        ./solvers/solver_adjoint_linear.cpp\
    11501150                                        ./solvers/solver_diagnostic_nonlinear.cpp\
     1151                                        ./solvers/solver_stokescoupling_nonlinear.cpp\
    11511152                                        ./solvers/solver_thermal_nonlinear.cpp\
    11521153                                        ./modules/Bamgx/Bamgx.cpp\
  • issm/trunk/src/c/solutions/diagnostic_core.cpp

    r5579 r6024  
    6363        }
    6464
    65         if (ismacayealpattyn){
     65        if (ismacayealpattyn^isstokes){
    6666               
    6767                if(verbose)_printf_("%s\n"," computing horizontal velocities...");
     
    7070        }
    7171       
    72        
    73         if (dim==3 & ~isstokes){
     72        if (ismacayealpattyn && isstokes){
     73
     74                if(verbose)_printf_("%s\n"," computing coupling macayealpattyn and stokes velocities and pressure ...");
     75                solver_stokescoupling_nonlinear(femmodel,conserve_loads);
     76        }
     77
     78        if (dim==3 & (ishutter || ismacayealpattyn)){
    7479
    7580                if(verbose)_printf_("%s\n"," computing vertical velocities...");
     
    7883        }
    7984
    80         if (isstokes){
    81 
    82                 if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
    83                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
    84                 solver_diagnostic_nonlinear(femmodel,conserve_loads);
    85         }
    8685
    8786        if(solution_type==DiagnosticSolutionEnum && !control_analysis){
  • issm/trunk/src/c/solvers/solvers.h

    r5997 r6024  
    1414void solver_thermal_nonlinear(FemModel* femmodel);
    1515void solver_diagnostic_nonlinear(FemModel* femmodel,bool conserve_loads);
     16void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads);
    1617void solver_linear(FemModel* femmodel);
    1718void solver_adjoint_linear(FemModel* femmodel);
Note: See TracChangeset for help on using the changeset viewer.