Changeset 4397

Timestamp:

07/05/10 18:42:22 (15 years ago)

Author:

Eric.Larour

Message:

We now have issm.exe, unique solution, that works for every solution. We rely
on SolutionConfiguration to figure out how many analyses, and what solution core we call.
A lot more simpler, less solutions, only one driver.

Location:

issm/trunk/src

Files:

• c/Makefile.am (modified) (3 diffs)
• c/issm.cpp (added)
• c/issm.h (modified) (2 diffs)
• c/solutions/SolutionConfiguration.cpp (added)
• c/solutions/balancedthickness.cpp (deleted)
• c/solutions/balancedthickness2.cpp (deleted)
• c/solutions/balancedvelocities.cpp (deleted)
• c/solutions/bedslope.cpp (deleted)
• c/solutions/diagnostic.cpp (deleted)
• c/solutions/prognostic.cpp (deleted)
• c/solutions/prognostic2.cpp (deleted)
• c/solutions/solutions.h (modified) (1 diff)
• c/solutions/steadystate.cpp (deleted)
• c/solutions/surfaceslope.cpp (deleted)
• c/solutions/thermal.cpp (deleted)
• c/solutions/transient2d.cpp (deleted)
• c/solutions/transient3d.cpp (deleted)
• m/classes/public/plot/applyoptions.m (modified) (1 diff)
• m/classes/public/queue/BuildQueueingScript.m (modified) (1 diff)
• m/classes/public/queue/ClusterScript.m (modified) (3 diffs)

issm/trunk/src/c/Makefile.am

@@ -1111 +1111 @@
                                         ./solutions/balancedthickness2_core.cpp\
                                         ./solutions/balancedvelocities_core.cpp\
-                                        ./solutions/surfaceslope.cpp\
                                         ./solutions/surfaceslope_core.cpp\
-                                        ./solutions/bedslope.cpp\
                                         ./solutions/bedslope_core.cpp\
                                         ./solutions/transient2d_core.cpp\
@@ -1120 +1118 @@
                                         ./solutions/steadystateconvergence.cpp\
                                         ./solutions/ResetBoundaryConditions.cpp\
+                                        ./solutions/SolutionConfiguration.cpp\
                                         ./solvers/solver_linear.cpp\
                                         ./solvers/solver_diagnostic_nonlinear.cpp\
@@ -1133 +1132 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = DiagnosticSolution.exe ThermalSolution.exe PrognosticSolution.exe Prognostic2Solution.exe BalancedthicknessSolution.exe Balancedthickness2Solution.exe BalancedvelocitiesSolution.exe Transient2DSolution.exe Transient3DSolution.exe SteadystateSolution.exe SurfaceSlopeSolution.exe BedSlopeSolution.exe 
+bin_PROGRAMS = issm.exe 
 endif
 
 LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
 
-DiagnosticSolution_exe_SOURCES = solutions/diagnostic.cpp
-DiagnosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-SteadystateSolution_exe_SOURCES = solutions/steadystate.cpp
-SteadystateSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-ThermalSolution_exe_SOURCES = solutions/thermal.cpp
-ThermalSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-PrognosticSolution_exe_SOURCES = solutions/prognostic.cpp
-PrognosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-Prognostic2Solution_exe_SOURCES = solutions/prognostic2.cpp
-Prognostic2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-BalancedthicknessSolution_exe_SOURCES = solutions/balancedthickness.cpp
-BalancedthicknessSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-Balancedthickness2Solution_exe_SOURCES = solutions/balancedthickness2.cpp
-Balancedthickness2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-BalancedvelocitiesSolution_exe_SOURCES = solutions/balancedvelocities.cpp
-BalancedvelocitiesSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-SurfaceSlopeSolution_exe_SOURCES = solutions/surfaceslope.cpp
-SurfaceSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-BedSlopeSolution_exe_SOURCES = solutions/bedslope.cpp
-BedSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-Transient2DSolution_exe_SOURCES = solutions/transient2d.cpp
-Transient2DSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
-
-Transient3DSolution_exe_SOURCES = solutions/transient3d.cpp
-Transient3DSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
+issm_exe_SOURCES = issm.cpp
+issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 

issm/trunk/src/c/issm.h

@@ -6 +6 @@
 #define  _ISSM_H_
 
+#ifdef HAVE_CONFIG_H
+        #include "config.h"
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
 #include "./include/include.h"
 #include "./shared/shared.h"
-#include "./objecs/objects.h"
+#include "./objects/objects.h"
 #include "./Container/Container.h"
 #include "./EnumDefinitions/EnumDefinitions.h"
@@ -14 +20 @@
 #include "./solutions/solutions.h"
 #include "./solvers/solvers.h"
+#include "./modules/modules.h"
 
 #endif //ifndef _ISSM_H_

issm/trunk/src/c/solutions/solutions.h

@@ -48 +48 @@
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type, int sub_analysis_type);
 
+//solution configuration
+void SolutionConfiguration(int** panalyses,int* pnumanalyses, void (**psolutioncore)(FemModel*),int solutiontype);
+
 #endif

issm/trunk/src/m/classes/public/plot/applyoptions.m

@@ -227 +227 @@
         set(gca,'XTickLabel',getfieldvalue(options,'XTickLabel'));
 end
+
+%xtick
+if exist(options,'xtick'),
+        set(gca,'xtick',getfieldvalue(options,'xtick'));
+end
+
+%ytick
+if exist(options,'ytick'),
+        set(gca,'ytick',getfieldvalue(options,'ytick'));
+end
+
 
 %position of figure

issm/trunk/src/m/classes/public/queue/BuildQueueingScript.m

@@ -21 +21 @@
 %close file
 fclose(fid);
-

issm/trunk/src/m/classes/public/queue/ClusterScript.m

@@ -24 +24 @@
         fprintf(fid,'ulimit -s unlimited\n');
         fprintf(fid,'ulimit -c 0\n');
-        fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
+        fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
         %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -39 +39 @@
         fprintf(fid,'rm -rf %s/%s.lock\n',executionpath,name);
         if mem_debug==0,
-                fprintf(fid,'mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
+                fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',np,codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
         else
-                fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/%s.exe %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',[ISSM_DIR '/externalpackages/valgrind/install/lib/libmpidebug.so'],np,[ISSM_DIR '/externalpackages/valgrind/install/bin/valgrind'],[ISSM_DIR '/externalpackages/valgrind/issm.supp'], codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
+                fprintf(fid,'LD_PRELOAD=%s mpirun -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s.bin %s.outbin %s.lock  2> %s.errlog >%s.outlog & ',[ISSM_DIR '/externalpackages/valgrind/install/lib/libmpidebug.so'],np,[ISSM_DIR '/externalpackages/valgrind/install/bin/valgrind'],[ISSM_DIR '/externalpackages/valgrind/issm.supp'], codepath,EnumAsString(analysis_type),executionpath,name,name,name,name,name);
         end
         %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -64 +64 @@
         fprintf(fid,'cd $PBS_O_WORKDIR\n');
         fprintf(fid,'export OMP_NUM_THREADS=1\n');
-        fprintf(fid,'dplace -s1 -c0-%i mpirun -np %i %s/%s.exe %s %s.bin %s.outbin %s.lock',np-1,np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
+        fprintf(fid,'dplace -s1 -c0-%i mpirun -np %i %s/issm.exe %s %s %s.bin %s.outbin %s.lock',np-1,np,codepath,EnumAsString(analysis_type),executionpath,name,name,name);
         %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%