Changeset 13693

Timestamp:

10/16/12 09:59:13 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved UpdateConstraintsx to FemModel method

Location:

issm/trunk-jpl

Files:

• externalpackages/android/android-ndk/install.sh (modified) (1 diff)
• externalpackages/android/android-sdk/install.sh (modified) (1 diff)
• externalpackages/distribute/install.sh (modified) (1 diff)
• externalpackages/numpy/install-macosx-lion.sh (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/classes/FemModel.h (modified) (1 diff)
• src/c/modules/UpdateConstraintsx (deleted)
• src/c/modules/modules.h (modified) (1 diff)
• src/c/solvers/solver_adjoint_linear.cpp (modified) (1 diff)
• src/c/solvers/solver_linear.cpp (modified) (1 diff)
• src/c/solvers/solver_newton.cpp (modified) (1 diff)
• src/c/solvers/solver_nonlinear.cpp (modified) (1 diff)
• src/c/solvers/solver_stokescoupling_nonlinear.cpp (modified) (1 diff)
• src/c/solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/android/android-ndk/install.sh

@@ -1 +1 @@
 #!/bin/bash
-set -eu
 
 # This installs the Android NDK (Native Development Kit)

issm/trunk-jpl/externalpackages/android/android-sdk/install.sh

@@ -1 +1 @@
 #!/bin/bash
-set -eu 
 
 # This installs the Android SDK (Software Development Kit)

issm/trunk-jpl/externalpackages/distribute/install.sh

@@ -4 +4 @@
 #Download from ISSM server
 $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://python-distribute.org/distribute_setup.py' 'distribute_setup.py'
-python distribute_setup.py
+sudo python distribute_setup.py

issm/trunk-jpl/externalpackages/numpy/install-macosx-lion.sh

@@ -6 +6 @@
 export FFLAGS=-ff2c
 
+#clean up
+rm -rf numpy
+rm -rf numpy-1.7.0b2
+
 #download numpy first
-git clone https://github.com/numpy/numpy.git
+#export GIT_SSL_NO_VERIFY=true 
+#git clone https://github.com/numpy/numpy.git
+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/numpy-1.7.0b2.tar.gz' 'numpy-1.7.0b2.tar.gz'
 
 #install numpy
-cd numpy
+tar -zxvf numpy-1.7.0b2.tar.gz
+cd numpy-1.7.0b2
 python setup.py build
 python setup.py install
+cd ..
+python -c "import numpy; print 'Installed NumPy', numpy.__version__"
+python -c "import numpy; numpy.test()"

issm/trunk-jpl/src/c/Makefile.am

@@ -304 +304 @@
                                         ./modules/SmbGradientsx/SmbGradientsx.h\
                                         ./modules/SmbGradientsx/SmbGradientsx.cpp\
-                                        ./modules/UpdateConstraintsx/UpdateConstraintsx.h\
-                                        ./modules/UpdateConstraintsx/UpdateConstraintsx.cpp\
                                         ./modules/MeshPartitionx/MeshPartitionx.h\
                                         ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -364 +364 @@
 }
 /*}}}*/
+/*FUNCTION void FemModel::UpdateConstraintsx(void){{{*/
+void FemModel::UpdateConstraintsx(void){
+
+        IssmDouble time;
+        int    analysis_type;
+
+        /*retrieve parameters: */
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        parameters->FindParam(&time,TimeEnum);
+
+        /*start module: */
+        if(VerboseModule()) _pprintLine_("   Updating constraints for time: " << time);
+
+        /*First, update dof constraints in nodes, using constraints: */
+        SpcNodesx(nodes,constraints,parameters,analysis_type); 
+
+        /*Now, update degrees of freedoms: */
+        NodesDofx(nodes,parameters,analysis_type);
+
+}

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -64 +64 @@
                 /*Modules: {{{*/
                 int UpdateVertexPositionsx(void);
-
+                void UpdateConstraintsx(void);
                 /*}}}*/
 

issm/trunk-jpl/src/c/modules/modules.h

@@ -121 +121 @@
 #include "./ThicknessAlongGradientx/ThicknessAlongGradientx.h"
 #include "./ThicknessAcrossGradientx/ThicknessAcrossGradientx.h"
-#include "./UpdateConstraintsx/UpdateConstraintsx.h"
 #include "./UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h"
 #include "./VerticesDofx/VerticesDofx.h"

issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp

@@ -24 +24 @@
         /*Recover parameters: */
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);

issm/trunk-jpl/src/c/solvers/solver_linear.cpp

@@ -22 +22 @@
         /*Recover parameters: */
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);

issm/trunk-jpl/src/c/solvers/solver_newton.cpp

@@ -38 +38 @@
         femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         count=1;

issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

@@ -39 +39 @@
         femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         /*Were loads requested as output? : */

issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp

@@ -41 +41 @@
         femmodel->parameters->FindParam(&min_mechanical_constraints,DiagnosticRiftPenaltyThresholdEnum);
         femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         count=1;

issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -49 +49 @@
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
-        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
+        femmodel->UpdateConstraintsx();
 
         for(;;){