Changeset 4031


Ignore:
Timestamp:
06/09/10 17:09:02 (15 years ago)
Author:
Eric.Larour
Message:

Updated Makefile.am to reflect new solvers directory + new surfaceslope and bedslope solutions instead of Slopecompute solution

File:
1 edited

Legend:

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

    r4025 r4031  
    942942                                        ./modules/OutputRiftsx/OutputRiftsx.cpp\
    943943                                        ./solutions/diagnostic_core.cpp\
    944                                         ./solutions/diagnostic_core_linear.cpp\
    945                                         ./solutions/diagnostic_core_nonlinear.cpp\
    946944                                        ./solutions/convergence.cpp\
    947945                                        ./solutions/thermal_core.cpp\
    948                                         ./solutions/thermal_core_nonlinear.cpp\
    949946                                        ./solutions/WriteLockFile.cpp\
    950947                                        ./solutions/control_core.cpp\
     
    958955                                        ./solutions/balancedthickness2_core.cpp\
    959956                                        ./solutions/balancedvelocities_core.cpp\
    960                                         ./solutions/slopecompute_core.cpp\
    961                                         ./solutions/slope_core.cpp\
     957                                        ./solutions/surfaceslope.cpp\
     958                                        ./solutions/surfaceslope_core.cpp\
     959                                        ./solutions/bedslope.cpp\
     960                                        ./solutions/bedslope_core.cpp\
    962961                                        ./solutions/transient_core.cpp\
    963962                                        ./solutions/transient_core_2d.cpp\
     
    965964                                        ./solutions/steadystate_core.cpp\
    966965                                        ./solutions/ResetBoundaryConditions.cpp\
    967                                         ./solutions/solve_linear.cpp\
     966                                        ./solvers/solver_linear.cpp\
     967                                        ./solvers/solver_diagnostic_nonlinear.cpp\
     968                                        ./solvers/solver_thermal_nonlinear.cpp\
    968969                                        ./modules/Bamgx/Bamgx.cpp\
    969970                                        ./modules/Bamgx/Bamgx.h\
     
    976977bin_PROGRAMS =
    977978else
    978 bin_PROGRAMS = DiagnosticAnalysis.exe
    979 dnl bin_PROGRAMS = DiagnosticAnalysis.exe ThermalAnalysis.exe PrognosticAnalysis.exe Prognostic2Analysis.exe BalancedthicknessAnalysis.exe Balancedthickness2Analysis.exe BalancedvelocitiesAnalysis.exe TransientAnalysis.exe SteadystateAnalysis.exe SlopecomputeAnalysis.exe
     979bin_PROGRAMS = DiagnosticSolution.exe ThermalSolution.exe PrognosticSolution.exe Prognostic2Solution.exe BalancedthicknessSolution.exe Balancedthickness2Solution.exe BalancedvelocitiesSolution.exe TransientSolution.exe SteadystateSolution.exe SurfaceSlopeSolution.exe BedSlopeSolution.exe
    980980endif
    981981
    982982LDADD =    ./libpISSM.a $(PETSCLIB)    $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
    983983
    984 DiagnosticAnalysis_exe_SOURCES = solutions/diagnostic.cpp
    985 DiagnosticAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    986 
    987 SteadystateAnalysis_exe_SOURCES = solutions/steadystate.cpp
    988 SteadystateAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    989 
    990 ThermalAnalysis_exe_SOURCES = solutions/thermal.cpp
    991 ThermalAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    992 
    993 PrognosticAnalysis_exe_SOURCES = solutions/prognostic.cpp
    994 PrognosticAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    995 
    996 Prognostic2Analysis_exe_SOURCES = solutions/prognostic2.cpp
    997 Prognostic2Analysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    998 
    999 BalancedthicknessAnalysis_exe_SOURCES = solutions/balancedthickness.cpp
    1000 BalancedthicknessAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1001 
    1002 Balancedthickness2Analysis_exe_SOURCES = solutions/balancedthickness2.cpp
    1003 Balancedthickness2Analysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1004 
    1005 BalancedvelocitiesAnalysis_exe_SOURCES = solutions/balancedvelocities.cpp
    1006 BalancedvelocitiesAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1007 
    1008 SlopecomputeAnalysis_exe_SOURCES = solutions/slopecompute.cpp
    1009 SlopecomputeAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    1010 
    1011 TransientAnalysis_exe_SOURCES = solutions/transient.cpp
    1012 TransientAnalysis_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     984DiagnosticSolution_exe_SOURCES = solutions/diagnostic.cpp
     985DiagnosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     986
     987SteadystateSolution_exe_SOURCES = solutions/steadystate.cpp
     988SteadystateSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     989
     990ThermalSolution_exe_SOURCES = solutions/thermal.cpp
     991ThermalSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     992
     993PrognosticSolution_exe_SOURCES = solutions/prognostic.cpp
     994PrognosticSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     995
     996Prognostic2Solution_exe_SOURCES = solutions/prognostic2.cpp
     997Prognostic2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     998
     999BalancedthicknessSolution_exe_SOURCES = solutions/balancedthickness.cpp
     1000BalancedthicknessSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1001
     1002Balancedthickness2Solution_exe_SOURCES = solutions/balancedthickness2.cpp
     1003Balancedthickness2Solution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1004
     1005BalancedvelocitiesSolution_exe_SOURCES = solutions/balancedvelocities.cpp
     1006BalancedvelocitiesSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1007
     1008SurfaceSlopeSolution_exe_SOURCES = solutions/surfaceslope.cpp
     1009SurfaceSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1010
     1011BedSlopeSolution_exe_SOURCES = solutions/bedslope.cpp
     1012BedSlopeSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     1013
     1014TransientSolution_exe_SOURCES = solutions/transient.cpp
     1015TransientSolution_exe_CXXFLAGS= -fPIC -D_PARALLEL_
Note: See TracChangeset for help on using the changeset viewer.