Changeset 16192


Ignore:
Timestamp:
09/19/13 21:11:20 (11 years ago)
Author:
Eric.Larour
Message:

CHG: adjusted adolc tests to work only with gsl. Also added _HAVE_GSL_ as config flag detectable by IssmConfig wrapper.
Finally, created some new src/m/solvers to setup issm mumps and gsl solvers.

Location:
issm/trunk-jpl
Files:
28 edited

Legend:

Unmodified
Added
Removed

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

    r16164 r16192  
    542542                }
    543543                delete dependent_objects;
    544                 xDelete<IssmPDouble>(dependents);
     544                if(num_dependents)xDelete<IssmPDouble>(dependents);
    545545                #else
    546546                _error_("Should not be requesting dependents when an AD library is not available!");

  • issm/trunk-jpl/src/m/classes/toolkits.m

    r15907 r16192  
    4848                                 end
    4949                         else
    50                                  obj.DefaultAnalysis           = issmsolver();
     50                                 if IssmConfig('_HAVE_MUMPS_'),
     51                                         obj.DefaultAnalysis           = issmmumpssolver();
     52                                 elseif IssmConfig('_HAVE_GSL_'),
     53                                         obj.DefaultAnalysis           = issmgslsolver();
     54                                 else
     55                                         error('Need at least Mumps or Gsl to define an issm solver type');
     56                                 end
    5157                         end
    5258

  • issm/trunk-jpl/src/m/classes/toolkits.py

    r15907 r16192  
    2525                                self.DefaultAnalysis           = iluasmoptions()
    2626                else:
    27                         self.DefaultAnalysis           = issmsolver()
     27                        if IssmConfig('_HAVE_MUMPS_')[0]:
     28                                self.DefaultAnalysis           = issmmumpssolver()
     29                        elif IssmConfig('_HAVE_GSL_')[0]:
     30                                self.DefaultAnalysis           = issmgslsolver()
     31                        else:
     32                                raise IOError("ToolkitsFile error: need at least Mumps or Gsl to define issm solver type")
    2833
    2934                #The other properties are dynamic

  • issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp

    r16172 r16192  
    5050        else if(strcmp(name,"_HAVE_MUMPS_")==0){
    5151                #ifdef _HAVE_MUMPS_
     52                value = 1.;
     53                #else
     54                value = 0.;
     55                #endif
     56        }
     57        else if(strcmp(name,"_HAVE_GSL_")==0){
     58                #ifdef _HAVE_GSL_
    5259                value = 1.;
    5360                #else

  • issm/trunk-jpl/test/NightlyRun/test3001.m

    r15771 r16192  
    44md=setflowequation(md,'SSA','all');
    55md.cluster=generic('name',oshostname(),'np',1);
    6 md.toolkits.DefaultAnalysis=issmsolver();
    76md.stressbalance.requested_outputs=StressTensorEnum();
    87md.autodiff.isautodiff=true;
    9 md.toolkits.DefaultAnalysis=issmsolver();
    10 md.verbose=verbose('autodiff',true);
     8md.toolkits.DefaultAnalysis=issmgslsolver();
     9
    1110md=solve(md,StressbalanceSolutionEnum());
    1211

  • issm/trunk-jpl/test/NightlyRun/test3001.py

    r15771 r16192  
    1414md.cluster=generic('name',oshostname(),'np',1)
    1515md.stressbalance.requested_outputs=StressTensorEnum()
    16 md.toolkits.DefaultAnalysis=issmsolver()
     16md.toolkits.DefaultAnalysis=issmgslsolver()
    1717md.autodiff.isautodiff=True
    1818md=solve(md,StressbalanceSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3002.m

    r15771 r16192  
    66md.cluster=generic('name',oshostname(),'np',1);
    77md.autodiff.isautodiff=true;
    8 md.toolkits.DefaultAnalysis=issmsolver();
     8md.toolkits.DefaultAnalysis=issmgslsolver();
    99md.verbose=verbose('autodiff',true);
    1010md=solve(md,StressbalanceSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test3002.py

    r15771 r16192  
    1515md.cluster=generic('name',oshostname(),'np',1)
    1616md.autodiff.isautodiff=True
    17 md.toolkits.DefaultAnalysis=issmsolver()
     17md.toolkits.DefaultAnalysis=issmgslsolver()
    1818md=solve(md,StressbalanceSolutionEnum())
    1919

  • issm/trunk-jpl/test/NightlyRun/test3003.m

    r15771 r16192  
    77md.stressbalance.requested_outputs=StressTensorEnum();
    88md.autodiff.isautodiff=true;
    9 md.toolkits.DefaultAnalysis=issmsolver();
     9md.toolkits.DefaultAnalysis=issmgslsolver();
    1010md.verbose=verbose('autodiff',true);
    1111md=solve(md,StressbalanceSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test3003.py

    r15771 r16192  
    1515md.cluster=generic('name',oshostname(),'np',1)
    1616md.stressbalance.requested_outputs=StressTensorEnum()
    17 md.toolkits.DefaultAnalysis=issmsolver()
     17md.toolkits.DefaultAnalysis=issmgslsolver()
    1818md.autodiff.isautodiff=True
    1919md=solve(md,StressbalanceSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3004.m

    r15771 r16192  
    66md.cluster=generic('name',oshostname(),'np',1);
    77md.autodiff.isautodiff=true;
    8 md.toolkits.DefaultAnalysis=issmsolver();
     8md.toolkits.DefaultAnalysis=issmgslsolver();
    99md.verbose=verbose('autodiff',true);
    1010md=solve(md,StressbalanceSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test3004.py

    r15771 r16192  
    1414md=setflowequation(md,'FS','all')
    1515md.cluster=generic('name',oshostname(),'np',1)
    16 md.toolkits.DefaultAnalysis=issmsolver()
     16md.toolkits.DefaultAnalysis=issmgslsolver()
    1717md.autodiff.isautodiff=True
    1818md=solve(md,StressbalanceSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3005.m

    r15767 r16192  
    55md.cluster=generic('name',oshostname(),'np',1);
    66md.autodiff.isautodiff=true;
    7 md.toolkits.DefaultAnalysis=issmsolver();
     7md.toolkits.DefaultAnalysis=issmgslsolver();
    88md.verbose=verbose('autodiff',true);
    99md=solve(md,MasstransportSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test3005.py

    r15767 r16192  
    1313md=setflowequation(md,'SSA','all')
    1414md.cluster=generic('name',oshostname(),'np',1)
    15 md.toolkits.DefaultAnalysis=issmsolver()
     15md.toolkits.DefaultAnalysis=issmgslsolver()
    1616md.autodiff.isautodiff=True
    1717md=solve(md,MasstransportSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3006.m

    r15767 r16192  
    88md.masstransport.spcthickness=md.geometry.thickness;
    99md.autodiff.isautodiff=true;
    10 md.toolkits.DefaultAnalysis=issmsolver();
     10md.toolkits.DefaultAnalysis=issmgslsolver();
    1111md.verbose=verbose('autodiff',true);
    1212md=solve(md,MasstransportSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test3006.py

    r15767 r16192  
    1717md.masstransport.stabilization=3
    1818md.masstransport.spcthickness=md.geometry.thickness
    19 md.toolkits.DefaultAnalysis=issmsolver()
     19md.toolkits.DefaultAnalysis=issmgslsolver()
    2020md.autodiff.isautodiff=True
    2121md=solve(md,MasstransportSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3007.m

    r15767 r16192  
    77md.autodiff.isautodiff=true;
    88md.verbose=verbose('autodiff',true);
    9 md.toolkits.DefaultAnalysis=issmsolver();
     9md.toolkits.DefaultAnalysis=issmgslsolver();
    1010md=solve(md,MasstransportSolutionEnum());
    1111

  • issm/trunk-jpl/test/NightlyRun/test3007.py

    r15767 r16192  
    1414md.extrude(5,3.)
    1515md.cluster=generic('name',oshostname(),'np',1)
    16 md.toolkits.DefaultAnalysis=issmsolver()
     16md.toolkits.DefaultAnalysis=issmgslsolver()
    1717md.autodiff.isautodiff=True
    1818md=solve(md,MasstransportSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3008.m

    r15565 r16192  
    88md.autodiff.isautodiff=true;
    99md.verbose=verbose('autodiff',true);
    10 md.toolkits.DefaultAnalysis=issmsolver();
     10md.toolkits.DefaultAnalysis=issmgslsolver();
    1111md=solve(md,ThermalSolutionEnum());
    1212

  • issm/trunk-jpl/test/NightlyRun/test3008.py

    r15565 r16192  
    1515md.timestepping.time_step=0
    1616md.cluster=generic('name',oshostname(),'np',1)
    17 md.toolkits.DefaultAnalysis=issmsolver()
     17md.toolkits.DefaultAnalysis=issmgslsolver()
    1818md.autodiff.isautodiff=True
    1919md=solve(md,ThermalSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3009.m

    r15771 r16192  
    1111md.autodiff.isautodiff=true;
    1212md.verbose=verbose('autodiff',true);
    13 md.toolkits.DefaultAnalysis=issmsolver();
     13md.toolkits.DefaultAnalysis=issmgslsolver();
    1414md=solve(md,TransientSolutionEnum());
    1515

  • issm/trunk-jpl/test/NightlyRun/test3009.py

    r15771 r16192  
    1818md.transient.isthermal=True
    1919md.transient.isgroundingline=False
    20 md.toolkits.DefaultAnalysis=issmsolver()
     20md.toolkits.DefaultAnalysis=issmgslsolver()
    2121md.autodiff.isautodiff=True
    2222md=solve(md,TransientSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test3010.m

    r15565 r16192  
    88md.autodiff.isautodiff=true;
    99md.verbose=verbose('autodiff',true);
    10 md.toolkits.DefaultAnalysis=issmsolver();
     10md.toolkits.DefaultAnalysis=issmgslsolver();
    1111md=solve(md,TransientSolutionEnum());
    1212

  • issm/trunk-jpl/test/NightlyRun/test3010.py

    r15565 r16192  
    1313md=setflowequation(md,'SSA','all')
    1414md.cluster=generic('name',oshostname(),'np',1)
    15 md.toolkits.DefaultAnalysis=issmsolver()
     15md.toolkits.DefaultAnalysis=issmgslsolver()
    1616md.transient.requested_outputs=IceVolumeEnum()
    1717

  • issm/trunk-jpl/test/NightlyRun/test3015.m

    r15767 r16192  
    1010md.masstransport.requested_outputs=IceVolumeEnum();
    1111md.verbose=verbose('autodiff',true);
    12 md.toolkits.DefaultAnalysis=issmsolver();
     12md.toolkits.DefaultAnalysis=issmgslsolver();
    1313
    1414%setup autodiff parameters

  • issm/trunk-jpl/test/NightlyRun/test3015.py

    r15767 r16192  
    2424md.masstransport.requested_outputs=IceVolumeEnum()
    2525md.verbose=verbose('autodiff',True)
     26md.toolkits.DefaultAnalysis=issmgslsolver()
    2627
    2728#setup autodiff parameters

  • issm/trunk-jpl/test/NightlyRun/test3019.m

    r15565 r16192  
    55md=setflowequation(md,'SSA','all');
    66md.cluster=generic('name',oshostname(),'np',1);
    7 md.toolkits.DefaultAnalysis=issmsolver();
     7md.toolkits.DefaultAnalysis=issmgslsolver();
    88
    99md.autodiff.isautodiff=true;

  • issm/trunk-jpl/test/NightlyRun/test3019.py

    r15565 r16192  
    1717md=setflowequation(md,'SSA','all')
    1818md.cluster=generic('name',oshostname(),'np',3)
     19md.toolkits.DefaultAnalysis=issmgslsolver()
    1920
    2021md.autodiff.isautodiff=True
Note: See TracChangeset for help on using the changeset viewer.