Changeset 14803

Timestamp:

04/30/13 08:35:57 (12 years ago)

Author:

Eric.Larour

Message:

CHG: introduced new benchmark name: 'gia'

Location:

issm/trunk-jpl

Files:

• src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (modified) (4 diffs)
• test/NightlyRun/runme.m (modified) (4 diffs)
• test/NightlyRun/runme.py (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp

@@ -71 +71 @@
 
         /*output: */
-        IssmDouble wi=1;
+        IssmDouble wi=0;
         
         /*inputs: */
@@ -123 +123 @@
         /*}}}*/
 
-        // Now, let's set pset from the data that we got in input to GiaDeflectionCorex: 
-
+        /*Now, let's set pset from the data that we got in input to GiaDeflectionCorex: */
         blockp_.pset[0]=lithosphere_thickness;
         blockp_.pset[1]=mantle_viscosity;
@@ -132 +131 @@
         blockp_.pset[5]=mantle_density;
         blockp_.pset[6]=re;
-//      blocko_.rhoi=rho_ice; // use this for non-benchmark experiments 
-//      blockp_.pset[6]=800000.0; // for testing benchmark, should be in meters 
-        blocko_.rhoi=1000.0;   // use this for benchmark not rho_ice = 917 kg m^-3
+        blocko_.rhoi=rho_ice; 
       
         /*loading history: */
         blocky_.zhload[0]=current_he;
         blocky_.zhload[1]=current_he;
-//      blocky_.zhload[0]=3000; // for testing benchmark 
-//      blocky_.zhload[1]=3000; // for testing benchmark  
 
         /*times: */
@@ -152 +147 @@
         /*radial distance of i-th element: */
         blockrad_.distrad=ri/1000.0; // in km
-//      blockrad_.distrad=500.0; // for testing benchmark 
 
         /*Call distme driver: */
         distme_(&idisk,&iedge); 
-        
+
         /*Call what0 driver: */
         what0_(&idisk,&iedge); 

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -12 +12 @@
 %      'id'            followed by the list of ids requested
 %      'exclude'       ids to be excluded from the test
-%      'benchmark'     'nightly' (nightly run/ daily run)
+%      'benchmark'     'all' (all of them)
+%                      'nightly' (nightly run/ daily run)
 %                      'ismip'  : validation of ismip-hom tests
 %                      'eismint': validation of eismint tests
@@ -18 +19 @@
 %                      'mesh'   : validation of mesh tests
 %                      'adolc'   : validation of adolc tests
+%                      'gia'   : validation of gia tests
 %                      ...
 %      'procedure'     'check' : run the test (default)
@@ -47 +49 @@
 %GET benchmark {{{
 benchmark=getfieldvalue(options,'benchmark','nightly');
-if ~ismember(benchmark,{'all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc'})
+if ~ismember(benchmark,{'all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','gia'})
         disp('runme warning: benchmark not supported, defaulting to test ''nightly''')
         benchmark='nightly';
@@ -115 +117 @@
 elseif strcmpi(benchmark,'referential'),
         test_ids=intersect(test_ids,[1601:1602]);
+elseif strcmpi(benchmark,'gia'),
+        test_ids=intersect(test_ids,[2001:2100]);
 elseif strcmpi(benchmark,'adolc'),
         test_ids=intersect(test_ids,[3001:3020]);

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -22 +22 @@
                'id'            followed by the list of ids requested
                'exclude'       ids to be excluded from the test
-               'benchmark'     'nightly' (nightly run/ daily run)
+               'benchmark'     'all' (all of the tests)
+                                   'nightly' (nightly run/ daily run)
                                'ismip'  : validation of ismip-hom tests
                                'eismint': validation of eismint tests
                                'thermal': validation of thermal tests
                                'mesh'   : validation of mesh tests
+                                                   'adolc'   : validation of adolc tests
+                           'gia'   : validation of gia tests
+
                                ...
                'procedure'     'check' : run the test (default)
@@ -50 +54 @@
         #Process options
         #GET benchmark {{{
-        if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc']):
+        if not ismember(benchmark,['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','gia']):
                 print "runme warning: benchmark '%s' not supported, defaulting to test 'nightly'." % benchmark
                 benchmark='nightly'
@@ -113 +117 @@
         elif strcmpi(benchmark,'referential'):
                 test_ids=test_ids.intersection(set(range(1601,1603)))
+        elif strcmpi(benchmark,'gia'):
+                test_ids=test_ids.intersection(set(range(2001,2100)))
         elif strcmpi(benchmark,'adolc'):
                 test_ids=test_ids.intersection(set(range(3001,3020)))