Changeset 18497

Timestamp:

09/10/14 14:14:34 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added some forcings

Location:

issm/trunk-jpl/src

Files:

• c/classes/Materials/Matpar.cpp (modified) (1 diff)
• c/classes/Materials/Matseaice.cpp (modified) (3 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/seaice.m (modified) (3 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/SeaiceCoriolisFactorEnum.m (added)

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -96 +96 @@
                         break;
                 case MatseaiceEnum:
+                        iomodel->Constant(&this->rho_ice,MaterialsRhoIceEnum);
                         iomodel->Constant(&this->poisson,MaterialsPoissonEnum);
                         iomodel->Constant(&this->young_modulus,MaterialsYoungModulusEnum);

issm/trunk-jpl/src/c/classes/Materials/Matseaice.cpp

@@ -33 +33 @@
 }
 /*}}}*/
-Matseaice::Matseaice(int matice_mid,int index, IoModel* iomodel){/*{{{*/
+Matseaice::Matseaice(int matseaice_mid,int index, IoModel* iomodel){/*{{{*/
 
         /*Intermediaries:*/
-        int    matice_eid;
+        int    matseaice_eid;
 
         /*Initialize id*/
-        this->mid=matice_mid;
+        this->mid=matseaice_mid;
 
         /*Hooks: */
-        matice_eid=index+1;
-        this->helement=new Hook(&matice_eid,1);
+        matseaice_eid=index+1;
+        this->helement=new Hook(&matseaice_eid,1);
         this->element=NULL;
 
@@ -83 +83 @@
 
         /*Output*/
-        Matseaice* matice=NULL;
+        Matseaice* matseaice=NULL;
 
         /*Initialize output*/
-        matice=new Matseaice();
+        matseaice=new Matseaice();
 
         /*copy fields: */
-        matice->mid=this->mid;
-        matice->helement=(Hook*)this->helement->copy();
-        matice->element =(Element*)this->helement->delivers();
+        matseaice->mid=this->mid;
+        matseaice->helement=(Hook*)this->helement->copy();
+        matseaice->element =(Element*)this->helement->delivers();
 
-        return matice;
+        return matseaice;
 }
 /*}}}*/
@@ -99 +99 @@
 
         /*Output*/
-        Matseaice* matice=NULL;
+        Matseaice* matseaice=NULL;
 
         /*Initialize output*/
-        matice=new Matseaice();
+        matseaice=new Matseaice();
 
         /*copy fields: */
-        matice->mid=this->mid;
-        matice->helement=(Hook*)this->helement->copy();
-        matice->element =element_in;
+        matseaice->mid=this->mid;
+        matseaice->helement=(Hook*)this->helement->copy();
+        matseaice->element =element_in;
 
-        return matice;
+        return matseaice;
 }
 /*}}}*/

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -751 +751 @@
         SeaiceSpcvxEnum,
         SeaiceSpcvyEnum,
+        SeaiceCoriolisFactorEnum,
         BasalforcingsRhoOceanEnum,
         BasalforcingsOceanCoefEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -710 +710 @@
                 case SeaiceSpcvxEnum : return "SeaiceSpcvx";
                 case SeaiceSpcvyEnum : return "SeaiceSpcvy";
+                case SeaiceCoriolisFactorEnum : return "SeaiceCoriolisFactor";
                 case BasalforcingsRhoOceanEnum : return "BasalforcingsRhoOcean";
                 case BasalforcingsOceanCoefEnum : return "BasalforcingsOceanCoef";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -725 +725 @@
               else if (strcmp(name,"SeaiceSpcvx")==0) return SeaiceSpcvxEnum;
               else if (strcmp(name,"SeaiceSpcvy")==0) return SeaiceSpcvyEnum;
+              else if (strcmp(name,"SeaiceCoriolisFactor")==0) return SeaiceCoriolisFactorEnum;
               else if (strcmp(name,"BasalforcingsRhoOcean")==0) return BasalforcingsRhoOceanEnum;
               else if (strcmp(name,"BasalforcingsOceanCoef")==0) return BasalforcingsOceanCoefEnum;

issm/trunk-jpl/src/m/classes/seaice.m

@@ -6 +6 @@
 classdef seaice
         properties (SetAccess=public) 
-                thickness     = NaN;
-                concentration = NaN;
-                spcvx         = NaN;
-                spcvy         = NaN;
+                thickness       = NaN;
+                concentration   = NaN;
+                spcvx           = NaN;
+                spcvy           = NaN;
+                coriolis_factor = NaN;
         end
         methods
@@ -26 +27 @@
                         md = checkfield(md,'fieldname','seaice.spcvx','size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','seaice.spcvy','size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','seaice.coriolis_factor','size',[md.mesh.numberofelements 1],'NaN',1,'>=',0);
                 end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   seaice parameters:'));
                         fielddisplay(obj,'thickness','sea ice thickness [m]');
+                        fielddisplay(obj,'concentration','sea ice concentration (between 0 and 1)');
                         fielddisplay(obj,'spcvx','x-axis velocity constraint (NaN means no constraint) [m/s]');
                         fielddisplay(obj,'spcvy','y-axis velocity constraint (NaN means no constraint) [m/s]');
+                        fielddisplay(obj,'coriolis_factor','factor applied to Coriolis forces (latitude dependent)');
                 end % }}}
                 function marshall(obj,md,fid) % {{{
@@ -38 +42 @@
                         WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','coriolis_factor','format','DoubleMat','mattype',2);
                 end % }}}
         end

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -702 +702 @@
 def SeaiceSpcvxEnum(): return StringToEnum("SeaiceSpcvx")[0]
 def SeaiceSpcvyEnum(): return StringToEnum("SeaiceSpcvy")[0]
+def SeaiceCoriolisFactorEnum(): return StringToEnum("SeaiceCoriolisFactor")[0]
 def BasalforcingsRhoOceanEnum(): return StringToEnum("BasalforcingsRhoOcean")[0]
 def BasalforcingsOceanCoefEnum(): return StringToEnum("BasalforcingsOceanCoef")[0]