Ignore:
Timestamp:
08/11/20 19:43:31 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moving inputs2 back to inputs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

    r25317 r25379  
    55#include "../shared/shared.h"
    66#include "../modules/modules.h"
    7 #include "../classes/Inputs2/TransientInput2.h"
     7#include "../classes/Inputs/TransientInput.h"
    88
    99/*Model processing*/
    … …  
    7979  iomodel->DeleteData(&requestedoutputs,numoutputs,"md.hydrology.requested_outputs");
    8080}/*}}}*/
    81 void HydrologyDCInefficientAnalysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
     81void HydrologyDCInefficientAnalysis::UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
    8282
    8383        bool   isefficientlayer;
    … …  
    9898                if(iomodel->my_elements[i]){
    9999                        Element* element=(Element*)elements->GetObjectByOffset(counter);
    100                         element->Update(inputs2,i,iomodel,analysis_counter,analysis_type,P1Enum);
     100                        element->Update(inputs,i,iomodel,analysis_counter,analysis_type,P1Enum);
    101101                        counter++;
    102102                }
    103103        }
    104         iomodel->FetchDataToInput(inputs2,elements,"md.geometry.thickness",ThicknessEnum);
    105         iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    106         iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    107         iomodel->FetchDataToInput(inputs2,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
    108         iomodel->FetchDataToInput(inputs2,elements,"md.hydrology.basal_moulin_input",HydrologydcBasalMoulinInputEnum);
    109         iomodel->FetchDataToInput(inputs2,elements,"md.initialization.sediment_head",SedimentHeadSubstepEnum);
    110         iomodel->FetchDataToInput(inputs2,elements,"md.hydrology.sediment_transmitivity",HydrologydcSedimentTransmitivityEnum);
    111         iomodel->FetchDataToInput(inputs2,elements,"md.hydrology.mask_thawed_node",HydrologydcMaskThawedNodeEnum);
     104        iomodel->FetchDataToInput(inputs,elements,"md.geometry.thickness",ThicknessEnum);
     105        iomodel->FetchDataToInput(inputs,elements,"md.geometry.base",BaseEnum);
     106        iomodel->FetchDataToInput(inputs,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
     107        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
     108        iomodel->FetchDataToInput(inputs,elements,"md.hydrology.basal_moulin_input",HydrologydcBasalMoulinInputEnum);
     109        iomodel->FetchDataToInput(inputs,elements,"md.initialization.sediment_head",SedimentHeadSubstepEnum);
     110        iomodel->FetchDataToInput(inputs,elements,"md.hydrology.sediment_transmitivity",HydrologydcSedimentTransmitivityEnum);
     111        iomodel->FetchDataToInput(inputs,elements,"md.hydrology.mask_thawed_node",HydrologydcMaskThawedNodeEnum);
    112112        if(iomodel->domaintype!=Domain2DhorizontalEnum){
    113                 iomodel->FetchDataToInput(inputs2,elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
    114                 iomodel->FetchDataToInput(inputs2,elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
     113                iomodel->FetchDataToInput(inputs,elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
     114                iomodel->FetchDataToInput(inputs,elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
    115115        }
    116116        if(isefficientlayer){
    117                 iomodel->FetchDataToInput(inputs2,elements,"md.hydrology.mask_eplactive_node",HydrologydcMaskEplactiveNodeEnum);
    118                 iomodel->FetchDataToInput(inputs2,elements,"md.initialization.epl_head",EplHeadSubstepEnum);
     117                iomodel->FetchDataToInput(inputs,elements,"md.hydrology.mask_eplactive_node",HydrologydcMaskEplactiveNodeEnum);
     118                iomodel->FetchDataToInput(inputs,elements,"md.initialization.epl_head",EplHeadSubstepEnum);
    119119        }
    120120
    … …  
    205205        }
    206206
    207         basalelement->GetInput2Value(&thawed_element,HydrologydcMaskThawedEltEnum);
     207        basalelement->GetInputValue(&thawed_element,HydrologydcMaskThawedEltEnum);
    208208
    209209        /*Check that all nodes are active, else return empty matrix*/
    … …  
    235235        basalelement ->FindParam(&dt,TimesteppingTimeStepEnum);
    236236        basalelement ->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    237         Input2* SedTrans_input = basalelement->GetInput2(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
    238         Input2* sed_head_input = basalelement->GetInput2(SedimentHeadSubstepEnum);
    239         Input2* base_input     = basalelement->GetInput2(BaseEnum);
     237        Input* SedTrans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
     238        Input* sed_head_input = basalelement->GetInput(SedimentHeadSubstepEnum);
     239        Input* base_input     = basalelement->GetInput(BaseEnum);
    240240
    241241        /*Transfer related Inputs*/
    242242        if(isefficientlayer){
    243                 basalelement->GetInput2Value(&active_element,HydrologydcMaskEplactiveEltEnum);
     243                basalelement->GetInputValue(&active_element,HydrologydcMaskEplactiveEltEnum);
    244244        }
    245245        /* Start  looping on the number of gaussian points: */
    … …  
    308308        }
    309309
    310         basalelement->GetInput2Value(&thawed_element,HydrologydcMaskThawedEltEnum);
     310        basalelement->GetInputValue(&thawed_element,HydrologydcMaskThawedEltEnum);
    311311
    312312        /*Check that all nodes are active, else return empty matrix*/
    … …  
    329329
    330330        IssmDouble *xyz_list             = NULL;
    331         Input2     *active_element_input = NULL;
    332         Input2     *old_wh_input         = NULL;
    333         Input2     *dummy_input          = NULL;
    334         Input2     *surface_runoff_input = NULL;
     331        Input     *active_element_input = NULL;
     332        Input     *old_wh_input         = NULL;
     333        Input     *dummy_input          = NULL;
     334        Input     *surface_runoff_input = NULL;
    335335
    336336        /*Fetch number of nodes and dof for this finite element*/
    … …  
    347347        basalelement->FindParam(&smb_model,SmbEnum);
    348348
    349         Input2* sed_head_input   = basalelement->GetInput2(SedimentHeadSubstepEnum);
    350         Input2* epl_head_input   = basalelement->GetInput2(EplHeadSubstepEnum);
    351         Input2* base_input       = basalelement->GetInput2(BaseEnum);
    352         Input2* basal_melt_input = basalelement->GetInput2(BasalforcingsGroundediceMeltingRateEnum); _assert_(basal_melt_input);
    353         Input2* SedTrans_input   = basalelement->GetInput2(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
     349        Input*  sed_head_input   = basalelement->GetInput(SedimentHeadSubstepEnum);
     350        Input*  epl_head_input   = basalelement->GetInput(EplHeadSubstepEnum);
     351        Input*  base_input       = basalelement->GetInput(BaseEnum);
     352        Input*  basal_melt_input = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(basal_melt_input);
     353        Input*  SedTrans_input   = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
    354354
    355355        if(dt!= 0.){
    356                 old_wh_input = basalelement->GetInput2(SedimentHeadOldEnum); _assert_(old_wh_input);
     356                old_wh_input = basalelement->GetInput(SedimentHeadOldEnum); _assert_(old_wh_input);
    357357        }
    358358        if(smb_model==SMBgradientscomponentsEnum){
    … …  
    363363                if(smbsubstepping==1){
    364364                        //no substeping for the smb we take the result from there
    365                         dummy_input = basalelement->GetInput2(SmbRunoffEnum); _assert_(dummy_input);
     365                        dummy_input = basalelement->GetInput(SmbRunoffEnum); _assert_(dummy_input);
    366366                }
    367367                else if(smbsubstepping>1 && smbsubstepping<=hydrologysubstepping){
    368368                        //finer hydro stepping, we take the value at the needed time
    369                         dummy_input = basalelement->GetInput2(SmbRunoffTransientEnum, time); _assert_(dummy_input);
     369                        dummy_input = basalelement->GetInput(SmbRunoffTransientEnum, time); _assert_(dummy_input);
    370370                }
    371371                else{
    372372                        //finer stepping in smb, we average the runoff from transient input
    373373                        basalelement->FindParam(&smb_averaging,SmbAveragingEnum);
    374                         dummy_input = basalelement->GetInput2(SmbRunoffTransientEnum,time-dt,time,smb_averaging); _assert_(dummy_input);
    375                 }
    376                 surface_runoff_input=xDynamicCast<Input2*>(dummy_input); _assert_(surface_runoff_input);
     374                        dummy_input = basalelement->GetInput(SmbRunoffTransientEnum,time-dt,time,smb_averaging); _assert_(dummy_input);
     375                }
     376                surface_runoff_input=xDynamicCast<Input*>(dummy_input); _assert_(surface_runoff_input);
    377377        }
    378378
    379379        /*Transfer related Inputs*/
    380380        if(isefficientlayer){
    381                 basalelement->GetInput2Value(&active_element,HydrologydcMaskEplactiveEltEnum);
     381                basalelement->GetInputValue(&active_element,HydrologydcMaskEplactiveEltEnum);
    382382        }
    383383
    … …  
    528528
    529529        /*Add input to the element: */
    530         element->AddBasalInput2(SedimentHeadSubstepEnum,values,P1Enum);
    531         element->AddBasalInput2(EffectivePressureSubstepEnum,pressure,P1Enum);
    532         element->AddBasalInput2(SedimentHeadResidualEnum,residual,P1Enum);
     530        element->AddBasalInput(SedimentHeadSubstepEnum,values,P1Enum);
     531        element->AddBasalInput(EffectivePressureSubstepEnum,pressure,P1Enum);
     532        element->AddBasalInput(SedimentHeadResidualEnum,residual,P1Enum);
    533533
    534534        /*Free ressources:*/
    … …  
    547547}/*}}}*/
    548548/*Intermediaries*/
    549 IssmDouble HydrologyDCInefficientAnalysis::SedimentStoring(Element* element,Gauss* gauss,Input2* sed_head_input, Input2* base_input){/*{{{*/
     549IssmDouble HydrologyDCInefficientAnalysis::SedimentStoring(Element* element,Gauss* gauss,Input* sed_head_input, Input* base_input){/*{{{*/
    550550        int unconf_scheme;
    551551        IssmDouble expfac;
    … …  
    577577        return sediment_storing;
    578578}/*}}}*/
    579 IssmDouble HydrologyDCInefficientAnalysis::SedimentTransmitivity(Element* element,Gauss* gauss,Input2* sed_head_input, Input2* base_input,Input2* SedTrans_input){/*{{{*/
     579IssmDouble HydrologyDCInefficientAnalysis::SedimentTransmitivity(Element* element,Gauss* gauss,Input* sed_head_input, Input* base_input,Input* SedTrans_input){/*{{{*/
    580580        int unconf_scheme;
    581581        IssmDouble sediment_transmitivity;
    … …  
    664664        return transfer;
    665665}/*}}}*/
    666 IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input2* epl_head_input){/*{{{*/
     666IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_head_input){/*{{{*/
    667667
    668668        int transfermethod;
    … …  
    696696                element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
    697697
    698                 Input2* input=element->GetInput2(HydrologydcMaskEplactiveNodeEnum); _assert_(input);
     698                Input* input=element->GetInput(HydrologydcMaskEplactiveNodeEnum); _assert_(input);
    699699                if(input->GetInputMax()>0.){
    700700                        element_active = true;
    … …  
    703703                        element_active = false;
    704704                }
    705                 element->SetBoolInput(element->inputs2,HydrologydcMaskEplactiveEltEnum,element_active);
     705                element->SetBoolInput(element->inputs,HydrologydcMaskEplactiveEltEnum,element_active);
    706706        }
    707707}/*}}}*/
    … …  
    756756                element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
    757757
    758                 Input2* input=element->GetInput2(HydrologydcMaskThawedNodeEnum); _assert_(input);
     758                Input* input=element->GetInput(HydrologydcMaskThawedNodeEnum); _assert_(input);
    759759                if(input->GetInputMax()>0.){
    760760                        element_active = true;
    … …  
    763763                        element_active = false;
    764764                }
    765                 element->SetBoolInput(element->inputs2,HydrologydcMaskThawedEltEnum,element_active);
     765                element->SetBoolInput(element->inputs,HydrologydcMaskThawedEltEnum,element_active);
    766766        }
    767767}/*}}}*/
    … …  
    791791        /*Pass the activity mask from elements to nodes*/
    792792        basalelement->GetInputListOnVertices(&active[0],HydrologydcMaskThawedNodeEnum);
    793         basalelement->GetInput2Value(&active_element,HydrologydcMaskThawedEltEnum);
     793        basalelement->GetInputValue(&active_element,HydrologydcMaskThawedEltEnum);
    794794
    795795        for(int i=0;i<numnodes;i++) flag+=active[i];
Note: See TracChangeset for help on using the changeset viewer.