Changeset 26237

Timestamp:

05/04/21 12:41:09 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

File:

• issm/trunk-jpl/src/c/cores/love_core.cpp (modified) (20 diffs)

issm/trunk-jpl/src/c/cores/love_core.cpp ¶

@@ -9 +9 @@
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
-#include "petscblaslapack.h"
-
+#include <petscblaslapack.h>
 
 void love_init(FemModel* femmodel, Matlitho* matlitho){/*{{{*/
@@ -42 +41 @@
         femmodel->parameters->SetParam(nyi,LoveNYiEquationsEnum);
         femmodel->parameters->SetParam(starting_layer,LoveStartingLayerEnum);
-}
-
+}/*}}}*/
 void GetEarthRheology(IssmDouble* pla, IssmDouble* pmu, int layer_index, IssmDouble omega,FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -103 +101 @@
 
 } /*}}}*/
-
-
 IssmDouble GetGravity(IssmDouble r2, int layer_index, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //computes gravity at radius r2
@@ -124 +120 @@
         return  g= GG*M/pow(r2,2.0);
 }/*}}}*/
-
 void fill_yi_prefactor(IssmDouble* yi_prefactor, int* pdeg, IssmDouble* pomega, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //precalculates partial derivative factors for function yi_derivatives
@@ -265 +260 @@
         }
 }/*}}}*/
-
 IssmDouble* yi_derivatives(IssmDouble* y, int layer_index, int n, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //computes yi derivatives at r=radius[layer_index]+ n/nstep*(radius[layer_index+1]-radius[layer_index])
@@ -355 +349 @@
         return dydx;
 }/*}}}*/
-
 void propagate_yi_euler(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -374 +367 @@
         xDelete<IssmDouble>(dydx);
 }/*}}}*/
-
 void propagate_yi_RK2(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -409 +401 @@
         xDelete<IssmDouble>(y3);
 }/*}}}*/
-
 void propagate_yi_RK4(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -465 +456 @@
         xDelete<IssmDouble>(y3);
 }/*}}}*/
-
 void Innersphere_boundaryconditions(IssmDouble* yi, int layer_index, int deg, IssmDouble omega, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
         //fills the boundary conditions at the bottom of layer[layer_index] in yi[0:2][0:5]
@@ -517 +507 @@
         yi[5+nyi*2]=deg/(r*g0);
 }/*}}}*/
-
 void build_yi_system(IssmDouble* yi, int deg, IssmDouble omega, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho) { /*{{{*/
 
@@ -581 +570 @@
                 if (matlitho->issolid[i]){
                         one = -1.0;
-                        if (i>0 & !matlitho->issolid[i-1]) one = 1.0;
+                        if (i>0 && !matlitho->issolid[i-1]) one = 1.0;
                         for (int j=0;j<6;j++){
                                 yi[(j+6*ici)+ nyi*(j+6*ici+3)] = one;
@@ -627 +616 @@
         }
 }/*}}}*/
-
 void yi_boundary_conditions(IssmDouble* yi_righthandside, int deg, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -710 +698 @@
         }
 }/*}}}*/
-
-
 void solve_yi_system(IssmDouble* loveh, IssmDouble* lovel, IssmDouble* lovek, int deg, IssmDouble omega, IssmDouble* yi, IssmDouble* rhs, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -831 +817 @@
         xDelete<IssmDouble>(frequencies);       
 }/*}}}*/
-
 IssmDouble factorial(int n){ /*{{{*/
         IssmDouble prod=1;
@@ -837 +822 @@
         return prod;
 }/*}}}*/
-
 IssmDouble n_C_r(int n, int r){ /*{{{*/ 
         //n choose r
@@ -879 +863 @@
         return res = num/den;
 }/*}}}*/
-
-
 IssmDouble* postwidder_coef(int NTit){ /*{{{*/
         //Coefficients of the Post-Widder method through Saltzer summation for inverse Laplace transform:
@@ -903 +885 @@
         return xi;
 }/*}}}*/
-
 void postwidder_transform(IssmDouble* Lovet, IssmDouble* Lovef,int d, int t, int NTit, IssmDouble* xi, FemModel* femmodel){ /*{{{*/
         //Computes Lovet for time step t and degree d from the PW coefficients xi and the corresponding 2*NTit frequency samples in Lovef
@@ -934 +915 @@
         Lovet[d*nt+t]=LoveM[NTit-1];
 }/*}}}*/
-
 void love_freq_to_temporal(IssmDouble* LoveHt,IssmDouble* LoveLt,IssmDouble* LoveKt,IssmDouble* LoveHf,IssmDouble* LoveLf,IssmDouble* LoveKf, FemModel* femmodel){ /*{{{*/
         //Transforms all frequency-dependent love numbers into time-dependent love numbers
@@ -957 +937 @@
         xDelete<IssmDouble>(xi);
 }/*}}}*/
-
-
-
 void love_core(FemModel* femmodel){ /*{{{*/
 
@@ -1120 +1097 @@
         xDelete<IssmDouble>(LoveKernelsImag);
 } /*}}}*/
-