![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 111
- Timestamp:
- 04/28/09 15:48:05 (16 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 6 edited
-
Makefile.am (modified) (2 diffs)
-
ModelProcessorx/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (6 diffs)
-
objects/Matpar.cpp (modified) (6 diffs)
-
objects/Matpar.h (modified) (2 diffs)
-
objects/Penta.cpp (modified) (7 diffs)
-
objects/Penta.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r46 r111 71 71 ./shared/Numerics/numerics.h\ 72 72 ./shared/Numerics/GaussPoints.h\ 73 ./shared/Numerics/GaussPoints.cpp\ 74 ./shared/Numerics/BrentSearch.cpp\ 75 ./shared/Numerics/OptFunc.cpp\ 76 ./shared/Numerics/extrema.cpp\ 77 ./shared/Exceptions/exceptions.h\ 78 ./shared/Exceptions/Exceptions.cpp\ 79 ./shared/Exceptions/exprintf.cpp\ 80 ./shared/Exp/exp.h\ 81 ./shared/Exp/IsInPoly.cpp\ 82 ./shared/Exp/IsInPolySerial.cpp\ 83 ./shared/Exp/DomainOutlineRead.cpp\ 84 ./shared/TriMesh/trimesh.h\ 85 ./shared/TriMesh/AssociateSegmentToElement.cpp\ 86 ./shared/TriMesh/GridInsideHole.cpp\ 87 ./shared/TriMesh/OrderSegments.cpp\ 88 ./shared/TriMesh/SplitMeshForRifts.cpp\ 89 ./shared/TriMesh/TriMeshUtils.cpp\ 90 ./shared/Sorting/binary_search.cpp\ 91 ./shared/Sorting/sorting.h\ 92 ./shared/Elements/elements.h\ 93 ./shared/Elements/ResolvePointers.cpp\ 94 ./shared/Elements/Paterson.cpp\ 95 ./shared/Elements/GetElementNodeData.cpp\ 96 ./toolkits/petsc\ 97 ./toolkits/petsc/patches\ 98 ./toolkits/petsc/patches/petscpatches.h\ 99 ./toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp\ 100 ./toolkits/petsc/patches/MatlabVectorToPetscVector.cpp\ 101 ./toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp\ 102 ./toolkits/petsc/patches/PetscVectorToMatlabVector.cpp\ 103 ./toolkits/petsc/patches/MatlabMatrixToDoubleMatrix.cpp\ 104 ./toolkits/petsc/patches/MatlabVectorToDoubleVector.cpp\ 105 ./toolkits/petsc/patches/PetscDetermineLocalSize.cpp\ 106 ./toolkits/petsc/patches/VecTranspose.cpp\ 107 ./toolkits/petsc/patches/VecToMPISerial.cpp\ 108 ./toolkits/petsc/patches/MatToSerial.cpp\ 109 ./toolkits/petsc/patches/VecMerge.cpp\ 110 ./toolkits/petsc/patches/NewVec.cpp\ 111 ./toolkits/petsc/patches/NewVecFromLocalSize.cpp\ 112 ./toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp\ 113 ./toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp\ 114 ./toolkits/petsc/patches/NewMat.cpp\ 115 ./toolkits/petsc/patches/VecFree.cpp\ 116 ./toolkits/petsc/patches/KSPFree.cpp\ 117 ./toolkits/petsc/patches/ISFree.cpp\ 118 ./toolkits/petsc/patches/MatFree.cpp\ 119 ./toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp\ 120 ./toolkits/petsc/patches/VecPartition.cpp\ 121 ./toolkits/petsc/patches/MatPartition.cpp\ 122 ./toolkits/petsc/patches/MatInvert.cpp\ 123 ./toolkits/petsc/patches/MatMultPatch.cpp\ 124 ./toolkits/petsc/petscincludes.h\ 125 ./toolkits/mpi/mpiincludes.h\ 126 ./toolkits/mpi/patches/mpipatches.h\ 127 ./toolkits/mpi/patches/MPI_Upperrow.cpp\ 128 ./toolkits/mpi/patches/MPI_Lowerrow.cpp\ 129 ./toolkits/mpi/patches/MPI_Boundariesfromrange.cpp\ 130 ./toolkits/metis/metisincludes.h\ 131 ./toolkits/triangle/triangleincludes.h\ 132 ./toolkits.h\ 133 ./io/io.h\ 134 ./io/FetchData.cpp\ 135 ./io/WriteData.cpp\ 136 ./io/WriteDataToDisk.cpp\ 137 ./io/SerialFetchData.cpp\ 138 ./io/SerialWriteData.cpp\ 139 ./io/ParallelFetchData.cpp\ 140 ./io/ParallelFetchInteger.cpp\ 141 ./io/ParallelFetchMat.cpp\ 142 ./io/ParallelFetchScalar.cpp\ 143 ./io/ParallelFetchString.cpp\ 144 ./io/ModelFetchData.cpp\ 145 ./io/WriteNodeSets.cpp\ 146 ./io/WriteParams.cpp\ 147 ./io/FetchNodeSets.cpp\ 148 ./io/ParameterInputsInit.cpp\ 149 ./EnumDefinitions/EnumDefinitions.h\ 150 ./EnumDefinitions/EnumDefinitions.cpp\ 151 ./EnumDefinitions/AnalysisTypeAsEnum.cpp\ 152 ./ModelProcessorx/ModelProcessorx.h\ 153 ./ModelProcessorx/Model.cpp\ 154 ./ModelProcessorx/FetchRifts.cpp\ 155 ./ModelProcessorx/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\ 156 ./ModelProcessorx/DistributeNumDofs.cpp\ 157 ./ModelProcessorx/CreateConstraintsDiagnosticHoriz.cpp \ 158 ./ModelProcessorx/CreateLoadsDiagnosticHoriz.cpp\ 159 ./ModelProcessorx/ModelCreateParameters.cpp\ 160 ./Dofx/Dofx.h\ 161 ./Dofx/Dofx.cpp\ 162 ./Dux/Dux.h\ 163 ./Dux/Dux.cpp\ 164 ./ControlConstrainx/ControlConstrainx.h\ 165 ./ControlConstrainx/ControlConstrainx.cpp\ 166 ./Misfitx/Misfitx.h\ 167 ./Misfitx/Misfitx.cpp\ 168 ./Orthx/Orthx.h\ 169 ./Orthx/Orthx.cpp\ 170 ./Gradjx/Gradjx.h\ 171 ./Gradjx/Gradjx.cpp\ 172 ./UpdateFromInputsx/UpdateFromInputsx.h\ 173 ./UpdateFromInputsx/UpdateFromInputsx.cpp\ 174 ./ConfigureObjectsx/ConfigureObjectsx.h\ 175 ./ConfigureObjectsx/ConfigureObjectsx.cpp\ 176 ./BuildNodeSetsx/BuildNodeSetsx.h\ 177 ./BuildNodeSetsx/BuildNodeSetsx.cpp\ 178 ./BuildNodeSetsx/PartitionSets.cpp\ 179 ./SpcNodesx/SpcNodesx.h\ 180 ./SpcNodesx/SpcNodesx.cpp\ 181 ./MpcNodesx/MpcNodesx.h\ 182 ./MpcNodesx/MpcNodesx.cpp\ 183 ./DataInterpx/DataInterpx.cpp\ 184 ./DataInterpx/DataInterpx.h\ 185 ./HoleFillerx/HoleFillerx.cpp\ 186 ./HoleFillerx/HoleFillerx.h\ 187 ./MeshPartitionx/MeshPartitionx.cpp\ 188 ./MeshPartitionx/MeshPartitionx.h\ 189 ./ContourToMeshx/ContourToMeshx.cpp\ 190 ./ContourToMeshx/ContourToMeshx.h\ 191 ./Reducevectorgtosx/Reducevectorgtosx.cpp\ 192 ./Reducevectorgtosx/Reducevectorgtosx.h\ 193 ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\ 194 ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\ 195 ./Reducematrixfromgtofx/Reducematrixfromgtofx.h\ 196 ./Reduceloadfromgtofx/Reduceloadfromgtofx.h\ 197 ./Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\ 198 ./NormalizeConstraintsx/NormalizeConstraintsx.cpp\ 199 ./NormalizeConstraintsx/NormalizeConstraintsx.h\ 200 ./SystemMatricesx/SystemMatricesx.cpp\ 201 ./SystemMatricesx/SystemMatricesx.h\ 202 ./PenaltyConstraintsx/PenaltyConstraintsx.cpp\ 203 ./PenaltyConstraintsx/PenaltyConstraintsx.h\ 204 ./PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\ 205 ./PenaltySystemMatricesx/PenaltySystemMatricesx.h\ 206 ./Solverx/Solverx.cpp\ 207 ./Solverx/Solverx.h\ 208 ./Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\ 209 ./Mergesolutionfromftogx/Mergesolutionfromftogx.h\ 210 ./ProcessParamsx/ProcessParamsx.cpp\ 211 ./ProcessParamsx/ProcessParamsx.h 212 213 214 libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -ansi -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ 215 if LARGEARRAYS 216 libISSM_a_CXXFLAGS += -D__GCC4BUILD__ 217 else 218 libISSM_a_CXXFLAGS += -DMX_COMPAT_32 219 endif 220 221 222 223 224 #Parallel compilation 225 libpISSM_a_SOURCES = ./objects/objects.h\ 226 ./objects/Object.h\ 227 ./objects/Element.h\ 228 ./objects/Element.cpp\ 229 ./objects/Material.h\ 230 ./objects/Material.cpp\ 231 ./objects/Load.h\ 232 ./objects/Load.cpp\ 233 ./objects/SolverEnum.h\ 234 ./objects/Contour.h\ 235 ./objects/Contour.cpp\ 236 ./objects/OptArgs.h\ 237 ./objects/OptPars.h\ 238 ./objects/Friction.h\ 239 ./objects/Friction.cpp\ 240 ./objects/Node.h\ 241 ./objects/Node.cpp\ 242 ./objects/Tria.h\ 243 ./objects/Tria.cpp\ 244 ./objects/Penta.h\ 245 ./objects/Penta.cpp\ 246 ./objects/Matice.h\ 247 ./objects/Matice.cpp\ 248 ./objects/Matpar.h\ 249 ./objects/Matpar.cpp\ 250 ./objects/ParameterInputs.h\ 251 ./objects/ParameterInputs.cpp\ 252 ./objects/Spc.cpp\ 253 ./objects/Spc.h\ 254 ./objects/Rgb.cpp\ 255 ./objects/Rgb.h\ 256 ./objects/Penpair.cpp\ 257 ./objects/Penpair.h\ 258 ./objects/Icefront.cpp\ 259 ./objects/Icefront.h\ 260 ./objects/Param.cpp\ 261 ./objects/Param.h\ 262 ./objects/NodeSets.cpp\ 263 ./objects/NodeSets.h\ 264 ./DataSet/DataSet.cpp\ 265 ./DataSet/DataSet.h\ 266 ./shared/shared.h\ 267 ./shared/Alloc/alloc.h\ 268 ./shared/Alloc/alloc.cpp\ 269 ./shared/Matlab/matlabshared.h\ 270 ./shared/Matlab/PrintfFunction.cpp\ 271 ./shared/Matlab/ModuleBoot.cpp\ 272 ./shared/Matlab/mxGetAssignedField.cpp\ 273 ./shared/Matlab/mxGetField.cpp\ 274 ./shared/Matlab/CheckNumMatlabArguments.cpp\ 275 ./shared/Matrix/matrix.h\ 276 ./shared/Matrix/MatrixUtils.cpp\ 277 ./shared/Numerics/numerics.h\ 278 ./shared/Numerics/GaussPoints.h\ 73 ./shared/Numerics/cross.cpp\ 74 ./shared/Numerics/norm.cpp\ 279 75 ./shared/Numerics/GaussPoints.cpp\ 280 76 ./shared/Numerics/BrentSearch.cpp\ … … 416 212 ./ProcessParamsx/ProcessParamsx.cpp\ 417 213 ./ProcessParamsx/ProcessParamsx.h\ 214 ./VelocityExtrudex/VelocityExtrudex.cpp\ 215 ./VelocityExtrudex/VelocityExtrudex.h 216 217 218 219 libISSM_a_CXXFLAGS = -fPIC -DMATLAB -D_SERIAL_ -ansi -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ 220 if LARGEARRAYS 221 libISSM_a_CXXFLAGS += -D__GCC4BUILD__ 222 else 223 libISSM_a_CXXFLAGS += -DMX_COMPAT_32 224 endif 225 226 227 228 229 #Parallel compilation 230 libpISSM_a_SOURCES = ./objects/objects.h\ 231 ./objects/Object.h\ 232 ./objects/Element.h\ 233 ./objects/Element.cpp\ 234 ./objects/Material.h\ 235 ./objects/Material.cpp\ 236 ./objects/Load.h\ 237 ./objects/Load.cpp\ 238 ./objects/SolverEnum.h\ 239 ./objects/Contour.h\ 240 ./objects/Contour.cpp\ 241 ./objects/OptArgs.h\ 242 ./objects/OptPars.h\ 243 ./objects/Friction.h\ 244 ./objects/Friction.cpp\ 245 ./objects/Node.h\ 246 ./objects/Node.cpp\ 247 ./objects/Tria.h\ 248 ./objects/Tria.cpp\ 249 ./objects/Penta.h\ 250 ./objects/Penta.cpp\ 251 ./objects/Matice.h\ 252 ./objects/Matice.cpp\ 253 ./objects/Matpar.h\ 254 ./objects/Matpar.cpp\ 255 ./objects/ParameterInputs.h\ 256 ./objects/ParameterInputs.cpp\ 257 ./objects/Spc.cpp\ 258 ./objects/Spc.h\ 259 ./objects/Rgb.cpp\ 260 ./objects/Rgb.h\ 261 ./objects/Penpair.cpp\ 262 ./objects/Penpair.h\ 263 ./objects/Icefront.cpp\ 264 ./objects/Icefront.h\ 265 ./objects/Param.cpp\ 266 ./objects/Param.h\ 267 ./objects/NodeSets.cpp\ 268 ./objects/NodeSets.h\ 269 ./DataSet/DataSet.cpp\ 270 ./DataSet/DataSet.h\ 271 ./shared/shared.h\ 272 ./shared/Alloc/alloc.h\ 273 ./shared/Alloc/alloc.cpp\ 274 ./shared/Matlab/matlabshared.h\ 275 ./shared/Matlab/PrintfFunction.cpp\ 276 ./shared/Matlab/ModuleBoot.cpp\ 277 ./shared/Matlab/mxGetAssignedField.cpp\ 278 ./shared/Matlab/mxGetField.cpp\ 279 ./shared/Matlab/CheckNumMatlabArguments.cpp\ 280 ./shared/Matrix/matrix.h\ 281 ./shared/Matrix/MatrixUtils.cpp\ 282 ./shared/Numerics/numerics.h\ 283 ./shared/Numerics/GaussPoints.h\ 284 ./shared/Numerics/GaussPoints.cpp\ 285 ./shared/Numerics/cross.cpp\ 286 ./shared/Numerics/norm.cpp\ 287 ./shared/Numerics/BrentSearch.cpp\ 288 ./shared/Numerics/OptFunc.cpp\ 289 ./shared/Numerics/extrema.cpp\ 290 ./shared/Exceptions/exceptions.h\ 291 ./shared/Exceptions/Exceptions.cpp\ 292 ./shared/Exceptions/exprintf.cpp\ 293 ./shared/Exp/exp.h\ 294 ./shared/Exp/IsInPoly.cpp\ 295 ./shared/Exp/IsInPolySerial.cpp\ 296 ./shared/Exp/DomainOutlineRead.cpp\ 297 ./shared/TriMesh/trimesh.h\ 298 ./shared/TriMesh/AssociateSegmentToElement.cpp\ 299 ./shared/TriMesh/GridInsideHole.cpp\ 300 ./shared/TriMesh/OrderSegments.cpp\ 301 ./shared/TriMesh/SplitMeshForRifts.cpp\ 302 ./shared/TriMesh/TriMeshUtils.cpp\ 303 ./shared/Sorting/binary_search.cpp\ 304 ./shared/Sorting/sorting.h\ 305 ./shared/Elements/elements.h\ 306 ./shared/Elements/ResolvePointers.cpp\ 307 ./shared/Elements/Paterson.cpp\ 308 ./shared/Elements/GetElementNodeData.cpp\ 309 ./toolkits/petsc\ 310 ./toolkits/petsc/patches\ 311 ./toolkits/petsc/patches/petscpatches.h\ 312 ./toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp\ 313 ./toolkits/petsc/patches/MatlabVectorToPetscVector.cpp\ 314 ./toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp\ 315 ./toolkits/petsc/patches/PetscVectorToMatlabVector.cpp\ 316 ./toolkits/petsc/patches/MatlabMatrixToDoubleMatrix.cpp\ 317 ./toolkits/petsc/patches/MatlabVectorToDoubleVector.cpp\ 318 ./toolkits/petsc/patches/PetscDetermineLocalSize.cpp\ 319 ./toolkits/petsc/patches/VecTranspose.cpp\ 320 ./toolkits/petsc/patches/VecToMPISerial.cpp\ 321 ./toolkits/petsc/patches/MatToSerial.cpp\ 322 ./toolkits/petsc/patches/VecMerge.cpp\ 323 ./toolkits/petsc/patches/NewVec.cpp\ 324 ./toolkits/petsc/patches/NewVecFromLocalSize.cpp\ 325 ./toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp\ 326 ./toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp\ 327 ./toolkits/petsc/patches/NewMat.cpp\ 328 ./toolkits/petsc/patches/VecFree.cpp\ 329 ./toolkits/petsc/patches/KSPFree.cpp\ 330 ./toolkits/petsc/patches/ISFree.cpp\ 331 ./toolkits/petsc/patches/MatFree.cpp\ 332 ./toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp\ 333 ./toolkits/petsc/patches/VecPartition.cpp\ 334 ./toolkits/petsc/patches/MatPartition.cpp\ 335 ./toolkits/petsc/patches/MatInvert.cpp\ 336 ./toolkits/petsc/patches/MatMultPatch.cpp\ 337 ./toolkits/petsc/petscincludes.h\ 338 ./toolkits/mpi/mpiincludes.h\ 339 ./toolkits/mpi/patches/mpipatches.h\ 340 ./toolkits/mpi/patches/MPI_Upperrow.cpp\ 341 ./toolkits/mpi/patches/MPI_Lowerrow.cpp\ 342 ./toolkits/mpi/patches/MPI_Boundariesfromrange.cpp\ 343 ./toolkits/metis/metisincludes.h\ 344 ./toolkits/triangle/triangleincludes.h\ 345 ./toolkits.h\ 346 ./io/io.h\ 347 ./io/FetchData.cpp\ 348 ./io/WriteData.cpp\ 349 ./io/WriteDataToDisk.cpp\ 350 ./io/SerialFetchData.cpp\ 351 ./io/SerialWriteData.cpp\ 352 ./io/ParallelFetchData.cpp\ 353 ./io/ParallelFetchInteger.cpp\ 354 ./io/ParallelFetchMat.cpp\ 355 ./io/ParallelFetchScalar.cpp\ 356 ./io/ParallelFetchString.cpp\ 357 ./io/ModelFetchData.cpp\ 358 ./io/WriteNodeSets.cpp\ 359 ./io/WriteParams.cpp\ 360 ./io/FetchNodeSets.cpp\ 361 ./io/ParameterInputsInit.cpp\ 362 ./EnumDefinitions/EnumDefinitions.h\ 363 ./EnumDefinitions/EnumDefinitions.cpp\ 364 ./EnumDefinitions/AnalysisTypeAsEnum.cpp\ 365 ./ModelProcessorx/ModelProcessorx.h\ 366 ./ModelProcessorx/Model.cpp\ 367 ./ModelProcessorx/FetchRifts.cpp\ 368 ./ModelProcessorx/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\ 369 ./ModelProcessorx/DistributeNumDofs.cpp\ 370 ./ModelProcessorx/CreateConstraintsDiagnosticHoriz.cpp \ 371 ./ModelProcessorx/CreateLoadsDiagnosticHoriz.cpp\ 372 ./ModelProcessorx/ModelCreateParameters.cpp\ 373 ./Dofx/Dofx.h\ 374 ./Dofx/Dofx.cpp\ 375 ./Dux/Dux.h\ 376 ./Dux/Dux.cpp\ 377 ./ControlConstrainx/ControlConstrainx.h\ 378 ./ControlConstrainx/ControlConstrainx.cpp\ 379 ./Misfitx/Misfitx.h\ 380 ./Misfitx/Misfitx.cpp\ 381 ./Orthx/Orthx.h\ 382 ./Orthx/Orthx.cpp\ 383 ./Gradjx/Gradjx.h\ 384 ./Gradjx/Gradjx.cpp\ 385 ./UpdateFromInputsx/UpdateFromInputsx.h\ 386 ./UpdateFromInputsx/UpdateFromInputsx.cpp\ 387 ./ConfigureObjectsx/ConfigureObjectsx.h\ 388 ./ConfigureObjectsx/ConfigureObjectsx.cpp\ 389 ./BuildNodeSetsx/BuildNodeSetsx.h\ 390 ./BuildNodeSetsx/BuildNodeSetsx.cpp\ 391 ./BuildNodeSetsx/PartitionSets.cpp\ 392 ./SpcNodesx/SpcNodesx.h\ 393 ./SpcNodesx/SpcNodesx.cpp\ 394 ./MpcNodesx/MpcNodesx.h\ 395 ./MpcNodesx/MpcNodesx.cpp\ 396 ./DataInterpx/DataInterpx.cpp\ 397 ./DataInterpx/DataInterpx.h\ 398 ./HoleFillerx/HoleFillerx.cpp\ 399 ./HoleFillerx/HoleFillerx.h\ 400 ./MeshPartitionx/MeshPartitionx.cpp\ 401 ./MeshPartitionx/MeshPartitionx.h\ 402 ./ContourToMeshx/ContourToMeshx.cpp\ 403 ./ContourToMeshx/ContourToMeshx.h\ 404 ./Reducevectorgtosx/Reducevectorgtosx.cpp\ 405 ./Reducevectorgtosx/Reducevectorgtosx.h\ 406 ./Reducematrixfromgtofx/Reducematrixfromgtofx.cpp\ 407 ./Reducematrixfromgtofx/Reducematrixfromgton.cpp\ 408 ./Reducematrixfromgtofx/Reducematrixfromgtofx.h\ 409 ./Reduceloadfromgtofx/Reduceloadfromgtofx.h\ 410 ./Reduceloadfromgtofx/Reduceloadfromgtofx.cpp\ 411 ./NormalizeConstraintsx/NormalizeConstraintsx.cpp\ 412 ./NormalizeConstraintsx/NormalizeConstraintsx.h\ 413 ./SystemMatricesx/SystemMatricesx.cpp\ 414 ./SystemMatricesx/SystemMatricesx.h\ 415 ./PenaltyConstraintsx/PenaltyConstraintsx.cpp\ 416 ./PenaltyConstraintsx/PenaltyConstraintsx.h\ 417 ./PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\ 418 ./PenaltySystemMatricesx/PenaltySystemMatricesx.h\ 419 ./Solverx/Solverx.cpp\ 420 ./Solverx/Solverx.h\ 421 ./Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\ 422 ./Mergesolutionfromftogx/Mergesolutionfromftogx.h\ 423 ./ProcessParamsx/ProcessParamsx.cpp\ 424 ./ProcessParamsx/ProcessParamsx.h\ 425 ./VelocityExtrudex/VelocityExtrudex.cpp\ 426 ./VelocityExtrudex/VelocityExtrudex.h\ 418 427 ./parallel/diagnostic_core_nonlinear.cpp\ 419 428 ./parallel/CreateFemModel.cpp\ -
issm/trunk/src/c/ModelProcessorx/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp
r110 r111 97 97 int penta_artdiff; 98 98 int penta_thermal_steadystate; 99 double penta_viscosity_overshoot; 99 100 100 101 /*matpar constructor input: */ … … 110 111 double matpar_thermal_exchange_velocity; 111 112 double matpar_g; 112 double matpar_viscosity_overshoot;113 113 114 114 /* node constructor input: */ … … 381 381 penta_meanvel=model->meanvel; 382 382 penta_epsvel=model->epsvel; 383 384 /*viscosity_overshoot*/ 385 penta_viscosity_overshoot=model->viscosity_overshoot; 383 386 384 387 if (*(model->elements_type+2*i+0)==MacAyealEnum()){ //elements of type 3 are MacAyeal type Penta. We collapse the formulation on their base. … … 394 397 penta_p,penta_q,penta_shelf,penta_onbed,penta_onsurface,penta_meanvel,penta_epsvel, 395 398 penta_collapse,penta_melting,penta_accumulation,penta_geothermalflux,penta_artdiff, 396 penta_thermal_steadystate );399 penta_thermal_steadystate,penta_viscosity_overshoot); 397 400 398 401 /*Add penta element to elements dataset: */ … … 456 459 matpar_mid=model->numberofelements+1; //put it at the end of the materials 457 460 matpar_g=model->g; 458 matpar_viscosity_overshoot=model->viscosity_overshoot;459 461 matpar_rho_ice=model->rho_ice; 460 462 matpar_rho_water=model->rho_water; … … 470 472 matpar=new Matpar(matpar_mid,matpar_rho_ice,matpar_rho_water,matpar_heatcapacity,matpar_thermalconductivity, 471 473 matpar_latentheat,matpar_beta,matpar_meltingpoint,matpar_mixed_layer_capacity, 472 matpar_thermal_exchange_velocity,matpar_g ,matpar_viscosity_overshoot);474 matpar_thermal_exchange_velocity,matpar_g); 473 475 474 476 /*Add to materials datset: */ -
issm/trunk/src/c/objects/Matpar.cpp
r8 r111 20 20 return; 21 21 } 22 Matpar::Matpar(int matpar_mid, double matpar_rho_ice, double matpar_rho_water, double matpar_heatcapacity, double matpar_thermalconductivity, double matpar_latentheat, double matpar_beta, double matpar_meltingpoint, double matpar_mixed_layer_capacity, double matpar_thermal_exchange_velocity, double matpar_g , double matpar_viscosity_overshoot){22 Matpar::Matpar(int matpar_mid, double matpar_rho_ice, double matpar_rho_water, double matpar_heatcapacity, double matpar_thermalconductivity, double matpar_latentheat, double matpar_beta, double matpar_meltingpoint, double matpar_mixed_layer_capacity, double matpar_thermal_exchange_velocity, double matpar_g){ 23 23 24 24 … … 34 34 thermal_exchange_velocity=matpar_thermal_exchange_velocity; 35 35 g=matpar_g; 36 viscosity_overshoot=matpar_viscosity_overshoot;37 36 38 37 return; … … 56 55 printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity); 57 56 printf(" g: %g\n",g); 58 printf(" viscosity_overshoot: %g\n",viscosity_overshoot);59 57 return; 60 58 } … … 86 84 memcpy(marshalled_dataset,&thermal_exchange_velocity,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); 87 85 memcpy(marshalled_dataset,&g,sizeof(g));marshalled_dataset+=sizeof(g); 88 memcpy(marshalled_dataset,&viscosity_overshoot,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot);89 86 90 87 *pmarshalled_dataset=marshalled_dataset; … … 105 102 sizeof(thermal_exchange_velocity)+ 106 103 sizeof(g)+ 107 sizeof(viscosity_overshoot)+108 104 sizeof(int); //sizeof(int) for enum type 109 105 } … … 135 131 memcpy(&thermal_exchange_velocity,marshalled_dataset,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); 136 132 memcpy(&g,marshalled_dataset,sizeof(g));marshalled_dataset+=sizeof(g); 137 memcpy(&viscosity_overshoot,marshalled_dataset,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot);138 133 139 134 /*return: */ -
issm/trunk/src/c/objects/Matpar.h
r1 r111 22 22 double thermal_exchange_velocity; 23 23 double g; 24 double viscosity_overshoot;25 24 26 25 public: … … 28 27 Matpar(); 29 28 30 Matpar(int mid, double rho_ice, double rho_water, double heatcapacity, double thermalconductivity, double latentheat, double beta, double meltingpoint, double mixed_layer_capacity, double thermal_exchange_velocity, double g , double viscosity_overshoot);29 Matpar(int mid, double rho_ice, double rho_water, double heatcapacity, double thermalconductivity, double latentheat, double beta, double meltingpoint, double mixed_layer_capacity, double thermal_exchange_velocity, double g); 31 30 32 31 ~Matpar(); -
issm/trunk/src/c/objects/Penta.cpp
r92 r111 22 22 double penta_p, double penta_q, int penta_shelf, int penta_onbed, int penta_onsurface, double penta_meanvel,double penta_epsvel, 23 23 int penta_collapse, double penta_melting[6], double penta_accumulation[6], double penta_geothermalflux[6], 24 int penta_artdiff, int penta_thermal_steadystate ){24 int penta_artdiff, int penta_thermal_steadystate,double penta_viscosity_overshoot){ 25 25 26 26 int i; … … 58 58 artdiff = penta_artdiff; 59 59 thermal_steadystate = penta_thermal_steadystate; 60 viscosity_overshoot = penta_viscosity_overshoot; 60 61 61 62 return; … … 97 98 printf(" artdiff: %i\n",artdiff); 98 99 printf(" thermal_steadystate: %i\n",thermal_steadystate); 100 printf(" viscosity_overshoot: %i\n",viscosity_overshoot); 99 101 return; 100 102 } … … 143 145 memcpy(marshalled_dataset,&artdiff,sizeof(artdiff));marshalled_dataset+=sizeof(artdiff); 144 146 memcpy(marshalled_dataset,&thermal_steadystate,sizeof(thermal_steadystate));marshalled_dataset+=sizeof(thermal_steadystate); 147 memcpy(marshalled_dataset,&viscosity_overshoot,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot); 145 148 146 149 *pmarshalled_dataset=marshalled_dataset; … … 178 181 sizeof(artdiff)+ 179 182 sizeof(thermal_steadystate) + 183 sizeof(viscosity_overshoot) + 180 184 sizeof(int); //sizeof(int) for enum type 181 185 } … … 224 228 memcpy(&artdiff,marshalled_dataset,sizeof(artdiff));marshalled_dataset+=sizeof(artdiff); 225 229 memcpy(&thermal_steadystate,marshalled_dataset,sizeof(thermal_steadystate));marshalled_dataset+=sizeof(thermal_steadystate); 230 memcpy(&viscosity_overshoot,marshalled_dataset,sizeof(viscosity_overshoot));marshalled_dataset+=sizeof(viscosity_overshoot); 226 231 227 232 /*nodes and materials are not pointing to correct objects anymore:*/ … … 770 775 tria_node_offsets[2]=node_offsets[g2]; 771 776 772 tria= new Tria(id,mid,mparid,tria_node_ids,tria_h,tria_s,tria_b,tria_k, friction_type,p,q,shelf,meanvel,epsvel );777 tria= new Tria(id,mid,mparid,tria_node_ids,tria_h,tria_s,tria_b,tria_k, friction_type,p,q,shelf,meanvel,epsvel,viscosity_overshoot); 773 778 774 779 tria->NodeConfiguration(tria_node_ids,tria_nodes,tria_node_offsets); -
issm/trunk/src/c/objects/Penta.h
r96 r111 51 51 int artdiff; 52 52 int thermal_steadystate; 53 53 double viscosity_overshoot; 54 54 55 55 public: … … 59 59 double p, double q, int shelf, int onbed, int onsurface, double meanvel,double epsvel, 60 60 int collapse, double melting[6], double accumulation[6], double geothermalflux[6], 61 int artdiff, int thermal_steadystate );61 int artdiff, int thermal_steadystate,double viscosity_overshoot); 62 62 ~Penta(); 63 63
Note:
See TracChangeset
for help on using the changeset viewer.
