Changeset 1887


Ignore:
Timestamp:
08/25/09 14:17:22 (16 years ago)
Author:
Eric.Larour
Message:

some cleanup

Location:
issm/trunk/src/c/parallel
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/parallel/control.cpp

    r1886 r1887  
    8484        _printf_("\n   reading surface and bed slope computation model data:\n");
    8585        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
     86       
     87        /*recover parameters: */
     88        model->FindParam(&waitonlock,"waitonlock");
     89        model->FindParam(&qmu_analysis,"qmu_analysis");
    8690
    8791        _printf_("initialize inputs:\n");
    … …  
    105109
    106110        /*are we running the solution sequence, or a qmu wrapper around it? : */
    107         model->FindParam(&qmu_analysis,"qmu_analysis");
    108        
    109111        if(!qmu_analysis){
    110112
    … …  
    140142
    141143        _printf_("write lock file:\n");
    142         model->FindParam(&waitonlock,"waitonlock");
    143144        if (waitonlock){
    144145                WriteLockFile(lockname);

  • issm/trunk/src/c/parallel/diagnostic.cpp

    r1886 r1887  
    7777        _printf_("\n   reading surface and bed slope computation model data:\n");
    7878        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
     79       
     80        /*get parameters: */
     81        model->FindParam(&qmu_analysis,"qmu_analysis");
     82        model->FindParam(&waitonlock,"waitonlock");
    7983
    8084        _printf_("initialize inputs:\n");
    8185        model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
    8286        model->FindParam(&numberofnodes,"numberofnodes");
    83         model->FindParam(&qmu_analysis,"qmu_analysis");
    8487
    8588        inputs=new ParameterInputs;
    … …  
    119122
    120123        _printf_("write lock file:\n");
    121         model->FindParam(&waitonlock,"waitonlock");
    122124        if (waitonlock){
    123125                WriteLockFile(lockname);

  • issm/trunk/src/c/parallel/prognostic.cpp

    r1886 r1887  
    7474        model->AddFormulation(fid,PrognosticAnalysisEnum());
    7575
    76         //retrieve parameters used to fill inputs
     76        /*recover parameters: */
     77        model->FindParam(&waitonlock,"waitonlock");
     78        model->FindParam(&qmu_analysis,"qmu_analysis");
     79
     80        _printf_("initialize inputs:\n");
     81       
    7782        model->FindParam(&u_g_serial,"u_g",PrognosticAnalysisEnum());
    7883        model->FindParam(&h_g_initial,"h_g",PrognosticAnalysisEnum());
    … …  
    8287        model->FindParam(&yts,"yts");
    8388        model->FindParam(&numberofnodes,"numberofnodes");
    84         model->FindParam(&qmu_analysis,"qmu_analysis");
    85         model->FindParam(&waitonlock,"waitonlock");
    86 
    87         _printf_("initialize inputs:\n");
     89       
    8890        inputs=new ParameterInputs;
    8991        inputs->Add("velocity",u_g_serial,3,numberofnodes);

  • issm/trunk/src/c/parallel/steadystate.cpp

    r1886 r1887  
    8989        model->AddFormulation(fid,MeltingAnalysisEnum(),SteadyAnalysisEnum());
    9090
     91        /*recover parameters: */
     92        model->FindParam(&waitonlock,"waitonlock");
     93        model->FindParam(&qmu_analysis,"qmu_analysis");
     94
    9195        _printf_("initialize inputs:\n");
    92        
    9396        model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
    9497        model->FindParam(&p_g_initial,"p_g",ThermalAnalysisEnum());
    9598        model->FindParam(&dt,"dt");
    9699        model->FindParam(&numberofnodes,"numberofnodes");
    97         model->FindParam(&waitonlock,"waitonlock");
    98         model->FindParam(&qmu_analysis,"qmu_analysis");
    99 
     100       
    100101
    101102        inputs=new ParameterInputs;

  • issm/trunk/src/c/parallel/thermal.cpp

    r1881 r1887  
    7575        model->AddFormulation(fid,MeltingAnalysisEnum(),0);
    7676
     77        /*recover parameters: */
     78        model->FindParam(&waitonlock,"waitonlock");
     79        model->FindParam(&qmu_analysis,"qmu_analysis");
     80       
    7781        _printf_("initialize inputs:\n");
    7882        model->FindParam(&u_g,"u_g",ThermalAnalysisEnum(),0);
    7983        model->FindParam(&p_g,"p_g",ThermalAnalysisEnum(),0);
    8084        model->FindParam(&numberofnodes,"numberofnodes");
    81         model->FindParam(&waitonlock,"waitonlock");
    8285        model->FindParam(&dt,"dt");
    8386        model->FindParam(&yts,"yts");
    84         model->FindParam(&qmu_analysis,"qmu_analysis");
    8587
    8688        inputs=new ParameterInputs;
    … …  
    123125
    124126        _printf_("write lock file:\n");
    125         model->FindParam(&waitonlock,"waitonlock");
    126 
    127127        if (waitonlock){
    128128                WriteLockFile(lockname);

  • issm/trunk/src/c/parallel/transient.cpp

    r1886 r1887  
    9999        }
    100100
     101        /*recover parameters: */
     102        model->FindParam(&waitonlock,"waitonlock");
     103        model->FindParam(&qmu_analysis,"qmu_analysis");
     104
    101105        _printf_("initialize inputs:\n");
    102        
    103106        model->FindParam(&u_g,"u_g",ThermalAnalysisEnum());
    104107        model->FindParam(&m_g,"m_g",ThermalAnalysisEnum());
    … …  
    107110        model->FindParam(&dt,"dt");
    108111        model->FindParam(&yts,"yts");
    109         model->FindParam(&waitonlock,"waitonlock");
    110         model->FindParam(&qmu_analysis,"qmu_analysis");
    111 
     112       
    112113
    113114        inputs=new ParameterInputs;
Note: See TracChangeset for help on using the changeset viewer.