Changeset 21579

Timestamp:

02/28/17 16:28:11 (8 years ago)

Author:

adhikari

Message:

CHG: switched back to Gia from GiaIvins

Location:

issm/trunk-jpl/src/c/cores

Files:

• CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• cores.h (modified) (1 diff)
• gia_core.cpp (added)
• giaivins_core.cpp (deleted)
• transient_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp

@@ -65 +65 @@
                         solutioncore=&esa_core;
                         break;
-                case GiaIvinsSolutionEnum:
-                        #if _HAVE_GIAIVINS_
-                        solutioncore=&giaivins_core;
+                case GiaSolutionEnum:
+                        #if _HAVE_GIA_
+                        solutioncore=&gia_core;
                         #else
-                        _error_("ISSM not compiled with Gia Ivins capability");
+                        _error_("ISSM not compiled with Gia capability");
                         #endif
                         break;

issm/trunk-jpl/src/c/cores/cores.h

@@ -46 +46 @@
 void adgradient_core(FemModel* femmodel);
 void dummy_core(FemModel* femmodel);
-void giaivins_core(FemModel* femmodel);
+void gia_core(FemModel* femmodel);
 void esa_core(FemModel* femmodel);
 void smb_core(FemModel* femmodel);

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -21 +21 @@
         /*parameters: */
         IssmDouble finaltime,dt,yts;
-        bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgiaivins,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
+        bool       isstressbalance,ismasstransport,issmb,isFS,isthermal,isgroundingline,isgia,isslr,iscoupler,ismovingfront,isdamageevolution,ishydrology;
         bool       save_results,dakota_analysis;
         bool       time_adapt;
@@ -53 +53 @@
         femmodel->parameters->FindParam(&issmb,TransientIssmbEnum);
         femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
-        femmodel->parameters->FindParam(&isgiaivins,TransientIsgiaivinsEnum);
+        femmodel->parameters->FindParam(&isgia,TransientIsgiaEnum);
         femmodel->parameters->FindParam(&isslr,TransientIsslrEnum);
         femmodel->parameters->FindParam(&iscoupler,TransientIscouplerEnum);
@@ -138 +138 @@
                 FloatingiceMeltingRatex(femmodel);
                 
-                if(isgiaivins){
+                if(isgia){
                         if(VerboseSolution()) _printf0_("   computing glacial isostatic adjustment\n");
-                        #ifdef _HAVE_GIAIVINS_
-                        giaivins_core(femmodel);
+                        #ifdef _HAVE_GIA_
+                        gia_core(femmodel);
                         #else
                         _error_("ISSM was not compiled with gia capabilities. Exiting");