source: issm/oecreview/Archive/23390-24306/ISSM-23819-23820.diff

Last change on this file was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 3.2 KB
RevLine 
[24307]1Index: ../trunk-jpl/test/NightlyRun/test252.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test252.m (revision 23819)
4+++ ../trunk-jpl/test/NightlyRun/test252.m (revision 23820)
5@@ -13,7 +13,7 @@
6 %load hourly surface forcing date from 1979 to 2009:
7 inputs=load('../Data/gemb_input.mat');
8
9-%setup the inputs:
10+%setup the inputs:
11 md.smb.Ta=[repmat(inputs.Ta0',md.mesh.numberofelements,1);inputs.dateN'];
12 md.smb.V=[repmat(inputs.V0',md.mesh.numberofelements,1);inputs.dateN'];
13 md.smb.dswrf=[repmat(inputs.dsw0',md.mesh.numberofelements,1);inputs.dateN'];
14@@ -39,12 +39,12 @@
15 %smb settings
16 md.smb.requested_outputs={'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC','SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC'};
17
18-%only run smb core:
19+%only run smb core:
20 md.transient.isstressbalance=0;
21 md.transient.ismasstransport=0;
22 md.transient.isthermal=0;
23
24-%time stepping:
25+%time stepping:
26 md.timestepping.start_time=1965.6;
27 md.timestepping.final_time=1966.6;
28 md.timestepping.time_step=1/365.0;
29@@ -61,7 +61,7 @@
30 field_tolerances ={1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,...
31 1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,...
32 1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,...
33- 1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-11,5e-10,1e-12,1e-12,2e-11};
34+ 1e-11,1e-12,1e-11,4e-11,1e-11,1e-11,1e-12,1e-11,5e-10,1e-12,1e-12,2e-11};
35
36 field_values={...
37 (md.results.TransientSolution(1).SmbDz(1,1:230)),...
38Index: ../trunk-jpl/test/NightlyRun/test252.py
39===================================================================
40--- ../trunk-jpl/test/NightlyRun/test252.py (revision 23819)
41+++ ../trunk-jpl/test/NightlyRun/test252.py (revision 23820)
42@@ -70,7 +70,10 @@
43
44 #Fields and tolerances to track changes
45 field_names = ['SmbDz1','SmbT1' ,'SmbD1' ,'SmbRe1','SmbGdn1','SmbGsp1','SmbA1' ,'SmbEC1','SmbMassBalance1','SmbMAdd1','SmbDzAdd1','SmbFAC1','SmbDz2','SmbT2','SmbD2' ,'SmbRe2','SmbGdn2','SmbGsp2','SmbA2','SmbEC2','SmbMassBalance2','SmbMAdd2','SmbDzAdd2','SmbFAC2','SmbDz3','SmbT3','SmbD3','SmbRe3','SmbGdn3','SmbGsp3','SmbA3','SmbEC3','SmbMassBalance3','SmbMAdd3','SmbDzAdd3','SmbFAC3','SmbDz4','SmbT4' ,'SmbD4' ,'SmbRe4','SmbGdn4','SmbGsp4','SmbA4','SmbEC4','SmbMassBalance4','SmbMAdd4','SmbDzAdd4','SmbFAC4']
46-field_tolerances =[1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-11,5e-10,1e-12,1e-12,2e-11]
47+field_tolerances = [1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,
48+ 1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11,
49+ 1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,
50+ 1e-11,1e-12,1e-11,4e-11,1e-11,1e-11,1e-12,1e-11,5e-10,1e-12,1e-12,2e-11]
51
52 #shape is different in python solution (fixed using reshape) which can cause test failure:
53 field_values = [md.results.TransientSolution[0].SmbDz[0, 0:230].reshape(1, -1),
Note: See TracBrowser for help on using the repository browser.