Changeset 15024

Timestamp:

05/14/13 13:49:24 (12 years ago)

Author:

adhikari

Message:

CHG: dynamic memory allocation done. gives stable solutions. need to refine codes a bit though

Location:

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

Files:

• GiaDeflectionCorex.cpp (modified) (4 diffs)
• ojrule.f (modified) (5 diffs)
• stot.f (modified) (3 diffs)
• what0.f (modified) (4 diffs)

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

@@ -12 +12 @@
 #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 
-
 /*External blocks: {{{*/
 struct blockp{
@@ -21 +20 @@
         double rhoi;
 };
-
 
 struct blockn{
@@ -40 +38 @@
         int distme_( int* pidisk,int* piedge, int* pNtime, int* pNtimp, int* pNtimm, int* pNafter,double* time,double* bi,double* dmi,double* zhload,double* hload);
 
-        int what0_( int* pidisk,int* piedge);
+        int what0_( int* pidisk,int* piedge,int* pNtimp,int* pNtimm,double* time,double* bi,double* dmi);
         extern struct blockp blockp_;
         extern struct blocko blocko_;
@@ -175 +173 @@
         distme_(&idisk,&iedge,&Ntime,&Ntimp,&Ntimm,&Nafter,blockt_time,blockt_bi,blockt_dmi,blocky_zhload,blocko_hload); 
 
-
         /*Call what0 driver: */
-        what0_(&idisk,&iedge); 
+        what0_(&idisk,&iedge,&Ntimp,&Ntimm,blockt_time,blockt_bi,blockt_dmi); 
 
         /*output solution: */

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/ojrule.f

@@ -2 +2 @@
       implicit double precision(a-h,o-z)
       parameter (nhank = 1024)
-      parameter (N3G = 1)
-      parameter (npat = N3G)
       double precision yvalue(nhank),bcin(nhank)
       double precision wok, rpos
       double precision pset(7)
-      double precision swok, asrpos, aswokm, distrad
+      double precision aswokm, distrad
+c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       common /blockrad/ distrad
-c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       common /blockp/ pset
-      common /blocki/ INTERN
       common /blockn/ irate
-      common /blocks/ aswokm,asrpos,swok
+      common /blocks/ aswokm
       data zero /0.0d0/, one /1.0d0/, two /2.0d0/, three /3.0d0/,
      1rescal/ 1.0d0/
@@ -60 +57 @@
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       subroutine wolfc(rpos,wok)
-      parameter (N3G = 1)
-      parameter (npat = N3G)
       double precision wok, rpos
       double precision pset(7)
@@ -67 +62 @@
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       common /blockp/ pset
-      common /blocki/ INTERN
-      common /blockn/ irate
-      common /blocks/ aswokm,asrpos,swok
+      common /blocks/ aswokm
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 c make single prec. and return to dimensional units.
@@ -85 +78 @@
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       subroutine rates(rpos,wok)
-      parameter (N3G = 1)
-      parameter (npat = N3G)
       double precision wok, rpos
       double precision pset(7)
@@ -92 +83 @@
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       common /blockp/ pset
-      common /blocki/ INTERN
-      common /blockn/ irate
-      common /blocks/ aswokm,asrpos,swok
+      common /blocks/ aswokm
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       data ngyo /050201/

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/stot.f

@@ -1 @@
-      subroutine stot(ikval,qjadon,fltng)
+      subroutine stot(ikval,qjadon,fltng,Ntimp,Ntimm,time,bi,dmi)
       implicit double precision (a-h,o-z)
+      integer Ntimp,Ntimm
       parameter (Nafter = 1)
-      parameter (Ntime = 5)
-      parameter (Ntimm = Ntime-1)
       parameter (nhank = 1024)
-      parameter (Ntimp = Ntime + Nafter)
       double precision decay(2)
       double precision pset(7)
@@ -13 +11 @@
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
       common /blockm/ dekay1,dekay2,amp0,amp1,amp2
-      common /blockt/ time,bi,dmi
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 c  This subroutine returns the inverse Laplace transform to the
@@ -39 +36 @@
       xi1 = amp1(ikval)
       xi2 = amp2(ikval)
+
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 c note that tspan must be updated in the calling routine "what0.f"

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/what0.f

@@ -1 @@
-      subroutine what0(idisk,iedge)
+      subroutine what0(idisk,iedge,Ntimp,Ntimm,time,bi,dmi)
       implicit double precision (a-h,o-z)
+      integer Ntimp,Ntimm
       parameter (nhank = 1024)
       parameter (N = nhank/2)
@@ -8 +9 @@
      1decta(2),dyri1(nhank),dyri2(nhank),sna(nhank)
       double precision cinner(nhank),bcin(nhank)
+      double precision time(Ntimp),bi(Ntimm),dmi(Ntimm)
       integer maxk
 c ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -89 +91 @@
       pref = diku / ( diku + rghm )
       qjadon = one / ( four * zksamp(ik) * urat )
-      call stot(ik,qjadon,fltng)
+      call stot(ik,qjadon,fltng,Ntimp,Ntimm,time,bi,dmi)
       cinner(ik) = - fltng * pref * twoap
       bcin(ik) = cinner(ik) * dbesj1(xakap)
@@ -108 +110 @@
       pref = diku / ( diku + rghm )
       qjadon = one / ( four * zksamp(ik) * urat )
-      call stot(ik,qjadon,fltng)
+      call stot(ik,qjadon,fltng,Ntimp,Ntimm,time,bi,dmi)
       cinner(ik) = - fltng * pref * twoap
       bcin(ik) = cinner(ik) * oxakap * ( dsin(xakap) * oxakap