Changeset 6024
- Timestamp:
- 09/24/10 11:20:18 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r6014 r6024 1149 1149 ./solvers/solver_adjoint_linear.cpp\ 1150 1150 ./solvers/solver_diagnostic_nonlinear.cpp\ 1151 ./solvers/solver_stokescoupling_nonlinear.cpp\ 1151 1152 ./solvers/solver_thermal_nonlinear.cpp\ 1152 1153 ./modules/Bamgx/Bamgx.cpp\ -
issm/trunk/src/c/solutions/diagnostic_core.cpp
r5579 r6024 63 63 } 64 64 65 if (ismacayealpattyn ){65 if (ismacayealpattyn^isstokes){ 66 66 67 67 if(verbose)_printf_("%s\n"," computing horizontal velocities..."); … … 70 70 } 71 71 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)){ 74 79 75 80 if(verbose)_printf_("%s\n"," computing vertical velocities..."); … … 78 83 } 79 84 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 }86 85 87 86 if(solution_type==DiagnosticSolutionEnum && !control_analysis){ -
issm/trunk/src/c/solvers/solvers.h
r5997 r6024 14 14 void solver_thermal_nonlinear(FemModel* femmodel); 15 15 void solver_diagnostic_nonlinear(FemModel* femmodel,bool conserve_loads); 16 void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads); 16 17 void solver_linear(FemModel* femmodel); 17 18 void solver_adjoint_linear(FemModel* femmodel);
Note:
See TracChangeset
for help on using the changeset viewer.