Changeset 4397


Ignore:
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:
2 added
12 deleted
6 edited

Legend:

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

    r4363 r4397  
    11111111                                        ./solutions/balancedthickness2_core.cpp\
    11121112                                        ./solutions/balancedvelocities_core.cpp\
    1113                                         ./solutions/surfaceslope.cpp\
    11141113                                        ./solutions/surfaceslope_core.cpp\
    1115                                         ./solutions/bedslope.cpp\
    11161114                                        ./solutions/bedslope_core.cpp\
    11171115                                        ./solutions/transient2d_core.cpp\
     
    11201118                                        ./solutions/steadystateconvergence.cpp\
    11211119                                        ./solutions/ResetBoundaryConditions.cpp\
     1120                                        ./solutions/SolutionConfiguration.cpp\
    11221121                                        ./solvers/solver_linear.cpp\
    11231122                                        ./solvers/solver_diagnostic_nonlinear.cpp\
     
    11331132bin_PROGRAMS =
    11341133else
    1135 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
     1134bin_PROGRAMS = issm.exe
    11361135endif
    11371136
    11381137LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
    11391138
    1140 DiagnosticSolution_exe_SOURCES = solutions/diagnostic.cpp
    1141 DiagnosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1142 
    1143 SteadystateSolution_exe_SOURCES = solutions/steadystate.cpp
    1144 SteadystateSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1145 
    1146 ThermalSolution_exe_SOURCES = solutions/thermal.cpp
    1147 ThermalSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1148 
    1149 PrognosticSolution_exe_SOURCES = solutions/prognostic.cpp
    1150 PrognosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1151 
    1152 Prognostic2Solution_exe_SOURCES = solutions/prognostic2.cpp
    1153 Prognostic2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1154 
    1155 BalancedthicknessSolution_exe_SOURCES = solutions/balancedthickness.cpp
    1156 BalancedthicknessSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1157 
    1158 Balancedthickness2Solution_exe_SOURCES = solutions/balancedthickness2.cpp
    1159 Balancedthickness2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1160 
    1161 BalancedvelocitiesSolution_exe_SOURCES = solutions/balancedvelocities.cpp
    1162 BalancedvelocitiesSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1163 
    1164 SurfaceSlopeSolution_exe_SOURCES = solutions/surfaceslope.cpp
    1165 SurfaceSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1166 
    1167 BedSlopeSolution_exe_SOURCES = solutions/bedslope.cpp
    1168 BedSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1169 
    1170 Transient2DSolution_exe_SOURCES = solutions/transient2d.cpp
    1171 Transient2DSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1172 
    1173 Transient3DSolution_exe_SOURCES = solutions/transient3d.cpp
    1174 Transient3DSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1139issm_exe_SOURCES = issm.cpp
     1140issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_
  • issm/trunk/src/c/issm.h

    r4236 r4397  
    66#define  _ISSM_H_
    77
     8#ifdef HAVE_CONFIG_H
     9        #include "config.h"
     10#else
     11#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     12#endif
     13
    814#include "./include/include.h"
    915#include "./shared/shared.h"
    10 #include "./objecs/objects.h"
     16#include "./objects/objects.h"
    1117#include "./Container/Container.h"
    1218#include "./EnumDefinitions/EnumDefinitions.h"
     
    1420#include "./solutions/solutions.h"
    1521#include "./solvers/solvers.h"
     22#include "./modules/modules.h"
    1623
    1724#endif //ifndef _ISSM_H_
  • issm/trunk/src/c/solutions/solutions.h

    r4057 r4397  
    4848void ResetBoundaryConditions(FemModel* femmodel, int analysis_type, int sub_analysis_type);
    4949
     50//solution configuration
     51void SolutionConfiguration(int** panalyses,int* pnumanalyses, void (**psolutioncore)(FemModel*),int solutiontype);
     52
    5053#endif
  • issm/trunk/src/m/classes/public/plot/applyoptions.m

    r3994 r4397  
    227227        set(gca,'XTickLabel',getfieldvalue(options,'XTickLabel'));
    228228end
     229
     230%xtick
     231if exist(options,'xtick'),
     232        set(gca,'xtick',getfieldvalue(options,'xtick'));
     233end
     234
     235%ytick
     236if exist(options,'ytick'),
     237        set(gca,'ytick',getfieldvalue(options,'ytick'));
     238end
     239
    229240
    230241%position of figure
  • issm/trunk/src/m/classes/public/queue/BuildQueueingScript.m

    r3173 r4397  
    2121%close file
    2222fclose(fid);
    23 
  • issm/trunk/src/m/classes/public/queue/ClusterScript.m

    r4346 r4397  
    2424        fprintf(fid,'ulimit -s unlimited\n');
    2525        fprintf(fid,'ulimit -c 0\n');
    26         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);
     26        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);
    2727        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    2828
     
    3939        fprintf(fid,'rm -rf %s/%s.lock\n',executionpath,name);
    4040        if mem_debug==0,
    41                 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);
     41                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);
    4242        else
    43                 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);
     43                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);
    4444        end
    4545        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
    6464        fprintf(fid,'cd $PBS_O_WORKDIR\n');
    6565        fprintf(fid,'export OMP_NUM_THREADS=1\n');
    66         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);
     66        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);
    6767        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    6868
Note: See TracChangeset for help on using the changeset viewer.