Changeset 14746

Timestamp:

04/24/13 16:04:43 (12 years ago)

Author:

Eric.Larour

Message:

CHG: finished integration of statically allocated blocks distme into GiaDeflectionCorex.

Location:

issm/trunk-jpl

Files:

• src/c/classes/GiaDeflectionCoreArgs.h (modified) (2 diffs)
• src/c/classes/objects/Elements/Tria.cpp (modified) (4 diffs)
• src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (modified) (3 diffs)
• test/NightlyRun/test2001.m (modified) (1 diff)

issm/trunk-jpl/src/c/classes/GiaDeflectionCoreArgs.h

@@ -11 +11 @@
         IssmDouble ri; //radial distance from center of disk to vertex  i
         IssmDouble re; //radius of disk
+        IssmDouble current_he; //thickness of ice at current time
         IssmDouble* hes; //loading history (in ice thickness)
         IssmDouble* times; //loading history times
@@ -27 +28 @@
         IssmDouble rho_ice;
 
+        /*debug info: */
+        int        idisk; //id of the element we are running the gia code in.
+
 };
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -3057 +3057 @@
 
         /*thickness averages: */
+        IssmDouble current_he=NULL;
         IssmDouble* hes=NULL;
         IssmDouble* times=NULL;
@@ -3099 +3100 @@
         if (!thickness_input)_error_("thickness input needed to compute gia deflection!");
         thickness_input->GetInputAllTimeAverages(&hes,&times,&numtimes);
+        thickness_input->GetInputAverage(&current_he);
 
         /*recover lithosphere thickness: */
@@ -3118 +3120 @@
         /*start loading GiaDeflectionCore arguments: */
         arguments.re=re;
+        arguments.current_he=current_he;
         arguments.hes=hes;
         arguments.times=times;
@@ -3129 +3132 @@
         arguments.lithosphere_thickness=lithosphere_thickness;
         arguments.rho_ice=rho_ice;
+        arguments.idisk=this->id;
 
         for(i=0;i<gsize;i++){

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

@@ -14 +14 @@
 #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 
+#define Nrsl 1
+#define N3G 1
+#define Nafter 1
+#define Ntime 2
+#define Ntimp 3
+
+/*External blocks: {{{*/
+struct blockp{
+        double pset[7];
+};
+      
+struct blockt{
+        double time[Ntimp];
+        double* time;
+        double bi[Ntime];
+        double dmi[Ntime];
+};
+
+struct blocko{
+        double rhoi;
+        double hload[Ntime];
+};
+
+struct blocky{
+        double zhload[Ntime][N3G];
+};
+      
+
+extern "C" { 
+        int distme_( int* pidisk,int* piedge,int* pisolt);
+        extern struct blockp blockp_;
+        extern struct blockt blockt_;
+        extern struct blocko blocko_;
+        extern struct blocky blocky_;
+}
+/*}}}*/
+      
 void GiaDeflectionCorex( IssmDouble* pwi, GiaDeflectionCoreArgs* arguments){
 
         /*output: */
         IssmDouble wi=1;
+        
+        /*inputs: */
+        int iedge=1; //c iedge ......... = 1 square-edged, = 2 elliptical disc x-section  (see naruse.f)
+        int idisk=1; // disk #
+        int isolt=1002;
+
+        /*intermediary: */
 
         /*inputs: {{{*/
         IssmDouble ri; //radial distance from center of disk to vertex  i
         IssmDouble re; //radius of disk
+        IssmDouble current_he; //thickness at current time
         IssmDouble* hes; //loading history (in ice thickness)
         IssmDouble* times; //loading history times
@@ -37 +82 @@
         /*ice properties: */
         IssmDouble rho_ice;
+
+        /*some debug info: */
+        int disk_id;
         /*}}}*/
 
-        
         /*Recover material parameters and loading history: see GiaDeflectionCoreArgs for more details {{{*/
         ri=arguments->ri;
         re=arguments->re;
+        current_he=arguments->current_he;
         hes=arguments->hes;
         times=arguments->times;
@@ -54 +102 @@
         lithosphere_thickness=arguments->lithosphere_thickness;
         rho_ice=arguments->rho_ice; 
+        disk_id=arguments->idisk;
         /*}}}*/
+
+        /*Documentation for pset coming from naruse.f: 
+        c pset(1) ....... h (thickness of elastic lithosphere in km) 
+        c pset(2) ....... viscosity of sub-layer in Pa*s 
+        c pset(3) ....... elastic rigidity of lithosphere in dynes/cm^2 
+        c pset(4) ....... elastic rigidity of sub-lithosphere in dynes/cm^2 
+        c pset(5) ....... density of lithosphere in gm/cc 
+        c pset(6) ....... density of sub-lithosphere in gm/cc 
+        c pset(7) ....... =dset(1)
+        c dset(1) ....... disk radius in km 
+
+        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;
+        blockp_.pset[2]=lithosphere_shear_modulus;
+        blockp_.pset[3]=mantle_shear_modulus;
+        blockp_.pset[4]=lithosphere_density;
+        blockp_.pset[5]=mantle_density;
+        blockp_.pset[6]=re;
+        blocko_.rhoi=rho_ice;
+      
+        /*loading history: */
+        blocky_.zhload[0][0]=current_he;
+        blocky_.zhload[1][0]=current_he;
+
+        /*times: */
+        blockt_.time[0]=0.1;
+        blockt_.time[1]=2000;
+        blockt_.time[2]=1000;
+
+
+        /*Call distme driver: */
+        distme_(&idisk,&iedge,&isolt);
+
+        //printf("disk id: %i bi: [%g,%g] dmi: [%g,%g] \n",disk_id,blockt_.bi[0], blockt_.bi[1],blockt_.dmi[0],blockt_.dmi[1]);
 
         /*allocate output pointer: */

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

@@ -1 +1 @@
 %GIA test, inspired on test101
-md=triangle(model(),'../Exp/Square.exp',50000.);
+md=triangle(model(),'../Exp/Square.exp',100000.);
 md=setmask(md,'','');
 md=parameterize(md,'../Par/SquareSheetConstrained.par');