Changeset 27259

Timestamp:

09/01/22 14:42:24 (3 years ago)

Author:

Eric.Larour

Message:

CHG: fixing issue, can't be TWO, has to be INF.

Location:

issm/branches/trunk-larour-SLPS2022/src/c/cores

Files:

• love_core.cpp (modified) (6 diffs)
• sealevelchange_core.cpp (modified) (1 diff)

issm/branches/trunk-larour-SLPS2022/src/c/cores/love_core.cpp

@@ -1141 +1141 @@
         xDelete<doubletype>(pmtf_orthof);
 }/*}}}*/
-
-template <typename doubletype> void        compute_love_numbers(LoveNumbers<doubletype>* Lovef, LoveNumbers<doubletype>* Elastic, int forcing_type, int sh_cutoff, IssmDouble* frequencies, FemModel* femmodel, Matlitho* matlitho, LoveVariables* vars, bool verbosecpu){
+template <typename doubletype> void        compute_love_numbers(LoveNumbers<doubletype>* Lovef, LoveNumbers<doubletype>* Elastic, int forcing_type, int sh_cutoff, IssmDouble* frequencies, FemModel* femmodel, Matlitho* matlitho, LoveVariables* vars, bool verbosecpu){ /*{{{*/
 
         int nstep, kernel_index,kernel_indexe,deleted_layer_offset, deg, sh_nmin, sh_nmax, nfreq;
@@ -1425 +1424 @@
                 Lovef_local->Copy(Elastic);
         }
-        /*}}}*/
 
 
@@ -1606 +1604 @@
         //              matlitho->burgers_viscosity, matlitho->burgers_mu, matlitho->density, matlitho->rheologymodel, matlitho->issolid //matlitho inputs
         //              );
+        //              }
 
         /*Only when love_kernels is on*/
@@ -1634 +1633 @@
 /*cores and template instantiations:*/
 /*template instantiations :{{{*/
-template void love_core_template<IssmDouble>(FemModel* femmodel);
-template void love_core_template<IssmComplex>(FemModel* femmodel);
+/*template void          love_core_template<IssmDouble>(FemModel* femmodel);
+template void            love_core_template<IssmComplex>(FemModel* femmodel);
 template void        fill_yi_prefactor<IssmDouble>(IssmDouble* yi_prefactor, int* pdeg, IssmDouble* pomega, FemModel* femmodel, Matlitho* matlitho, LoveVariables* vars);
 template void        fill_yi_prefactor<IssmComplex>(IssmComplex* yi_prefactor, int* pdeg, IssmComplex* pomega, FemModel* femmodel, Matlitho* matlitho, LoveVariables* vars);
@@ -1659 +1658 @@
 template IssmDouble* postwidder_coef<IssmDouble>(int NTit);
 template IssmDouble  n_C_r<IssmDouble>(int n, int r);
-template void         postwidder_transform<IssmDouble>(IssmDouble* Lovet, IssmDouble* Lovef,int d, int t, int sh_nmax,int NTit, IssmDouble* xi, FemModel* femmodel);
+template void         postwidder_transform<IssmDouble>(IssmDouble* Lovet, IssmDouble* Lovef,int d, int t, int sh_nmax,int NTit, IssmDouble* xi, FemModel* femmodel);*/
 
 /*}}}*/
@@ -1668 +1667 @@
         femmodel->parameters->FindParam(&complex_computation,LoveComplexComputationEnum);
 
-        if(complex_computation) love_core_template<IssmComplex>(femmodel);
-        else                    love_core_template<IssmDouble>(femmodel);
+        //if(complex_computation) love_core_template<IssmComplex>(femmodel);
+        //else                    love_core_template<IssmDouble>(femmodel);
 
 } /*}}}*/

issm/branches/trunk-larour-SLPS2022/src/c/cores/sealevelchange_core.cpp

@@ -477 +477 @@
         femmodel->parameters->FindParam(&cumbslc,CumBslcEnum); 
 
-        gmtslc=deltastr->Norm(NORM_TWO);
+        gmtslc=deltastr->Norm(NORM_INF);
         cumgmtslc+=gmtslc;
         cumgmslc=cumbslc+cumgmtslc;