Changeset 21396

Timestamp:

11/17/16 22:54:30 (8 years ago)

Author:

Eric.Larour

Message:

CHG: rotational feedback.

File:

• issm/branches/trunk-larour-NatClimateChange2016/src/c/cores/sealevelrise_core_noneustatic.cpp (modified) (4 diffs)

issm/branches/trunk-larour-NatClimateChange2016/src/c/cores/sealevelrise_core_noneustatic.cpp

@@ -18 +18 @@
 
         Vector<IssmDouble> *Sgo    = NULL; //ocean convolution of the perturbation to gravity potential.
+        Vector<IssmDouble> *Sgo_rot= NULL; // rotational feedback 
         IssmDouble          Sgo_oceanaverage = 0;  //average of Sgo over the ocean.
 
@@ -27 +28 @@
         bool spherical=true;
         bool converged=true;
+        bool rotation=true;
         bool verboseconvolution=true;
         int max_nonlinear_iterations;
@@ -41 +43 @@
         femmodel->parameters->FindParam(&eps_abs,SealevelriseAbstolEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+        
+        /*computational flag: */
+        femmodel->parameters->FindParam(&rotation,SealevelriseRotationEnum);
 
         /*first, recover lat,long and radius vectors from vertices: */
@@ -75 +80 @@
                 Sgo->Assemble(); 
 
+                if(rotation){
+                        /*call rotational feedback  module: */
+                        Sgo_rot = new Vector<IssmDouble>(gsize); Sgo_rot->Assemble();
+                        femmodel->SealevelriseRotationalFeedback(Sgo_rot,Sg_old,latitude,longitude,radius); 
+                        Sgo_rot->Assemble(); 
+
+                        Sgo->AXPY(Sgo_rot,1); 
+                }
+                
                 /*we need to average Sgo over the ocean: RHS term  5 in Eq.4 of Farrel and clarke. Only the elements can do that: */
                 Sgo_oceanaverage=femmodel->SealevelriseOceanAverage(Sgo);