Changeset 27261


Ignore:
Timestamp:
09/02/22 05:58:35 (3 years ago)
Author:
vverjans
Message:

BUG fixing bugs in arma scripts

Location:
issm/trunk-jpl
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r27252 r27261  
    242242                        /*Retrieve autoregressive parameters*/
    243243         parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.ar_order",FrontalForcingsARMAarOrderEnum));
     244         parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.ma_order",FrontalForcingsARMAmaOrderEnum));
    244245         parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.arma_initialtime",FrontalForcingsARMAInitialTimeEnum));
    245246         parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.arma_timestep",FrontalForcingsARMATimestepEnum));

  • issm/trunk-jpl/src/c/modules/FrontalForcingsx/FrontalForcingsx.cpp

    r27260 r27261  
    5353   femmodel->parameters->FindParam(&numbasins,FrontalForcingsNumberofBasinsEnum);
    5454   femmodel->parameters->FindParam(&arorder,FrontalForcingsARMAarOrderEnum);
    55    femmodel->parameters->FindParam(&maorder,FrontalForcingsARMAarOrderEnum);
     55   femmodel->parameters->FindParam(&maorder,FrontalForcingsARMAmaOrderEnum);
    5656   IssmDouble tinit_arma;
    5757   IssmDouble* termconstant  = NULL;

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

    r27250 r27261  
    129129
    130130    def marshall(self, prefix, md, fid):  # {{{
    131         print('ARMA is still under development')
    132131        yts = md.constants.yts
    133132

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

    r27260 r27261  
    4949md.frontalforcings.basin_id             = idb_tf;
    5050md.frontalforcings.subglacial_discharge = 0.01*ones(md.mesh.numberofvertices,1);
    51 md.frontalforcings.const                = [0.005,0.001]; %intercept values of TF in basins [C]
     51md.frontalforcings.const                = [0.05,0.01]; %intercept values of TF in basins [C]
    5252md.frontalforcings.trend                = [0.0001,0.00001]; %trend values of TF in basins [C/yr]
    5353md.frontalforcings.arma_initialtime     = md.timestepping.start_time; %initial time in the AR model parameterization [yr]
    … …  
    6262
    6363% Covariance matrix
    64 covtf       = 1e-5*eye(nb_tf);
     64covtf       = 1e-4*eye(nb_tf);
    6565covclv      = 1e-1*eye(nb_clv);
    6666covclv(1,1) = 1/10*covclv(1,1);

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

    r27260 r27261  
    5454md.frontalforcings.basin_id = idb_tf
    5555md.frontalforcings.subglacial_discharge = 0.01 * np.ones((md.mesh.numberofvertices,))
    56 md.frontalforcings.const = np.array([[0.005, 0.001]])  # intercept values of TF in basins [C]
     56md.frontalforcings.const = np.array([[0.05, 0.01]])  # intercept values of TF in basins [C]
    5757md.frontalforcings.trend = np.array([[0.0001, 0.00001]])  # trend values of TF in basins [C/yr]
    5858md.frontalforcings.arma_initialtime = md.timestepping.start_time  # initial time in the AR model parameterization [yr]
    … …  
    7676
    7777#Hard-coding covariance matrix because python is complaining
    78 covglob = np.array([[1e-5, 0., 0., 0., 0., 0.],
    79                     [0., 1e-5, 0., 0., 0., 0.],
     78covglob = np.array([[1e-4, 0., 0., 0., 0., 0.],
     79                    [0., 1e-4, 0., 0., 0., 0.],
    8080                    [0., 0., 1e-2, 0., 0., 0.],
    8181                    [0., 0., 0., 1e-1, 0., 0.],

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

    r27260 r27261  
    6464md.basalforcings.arma_timestep  = 1.0  # timestep of the ARMA model [yr]
    6565md.basalforcings.arlag_coefs  = np.array([[0.0], [0.1]])  # autoregressive parameters
    66 md.basalforcings.malag_coefs  = np.array([[0.0], [0.0]])  # moving-average parameters
     66md.basalforcings.malag_coefs  = np.array([[0.55], [0.34]])  # moving-average parameters
    6767md.basalforcings.deepwater_elevation = np.array([[-1000, -1520]])
    6868md.basalforcings.upperwater_elevation = np.array([[0, -50]])
Note: See TracChangeset for help on using the changeset viewer.