Changeset 25465

Timestamp:

08/25/20 11:27:09 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: making transient_core more homogeneous

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• cores/cores.h (modified) (1 diff)
• cores/esa_core.cpp (modified) (1 diff)
• cores/groundingline_core.cpp (added)
• cores/sealevelchange_core.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (4 diffs)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -312 +312 @@
         ./cores/levelsetfunctionslope_core.cpp \
         ./cores/movingfront_core.cpp \
+        ./cores/groundingline_core.cpp \
         ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp \
         ./classes/Loads/Riftfront.cpp \

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

@@ -26 +26 @@
 void levelsetfunctionslope_core(FemModel* femmodel);
 void movingfront_core(FemModel* femmodel);
+void groundingline_core(FemModel* femmodel);
 void bedslope_core(FemModel* femmodel);
 void meshdeformation_core(FemModel* femmodel);

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

@@ -64 +64 @@
 
         /*early return: */
-        if( !iscoupler & !isesa) return;  //we are not interested in being here :) 
+        if(!iscoupler & !isesa) return;  //we are not interested in being here :) 
 
         /*In what follows we assume we are all running esa, either in coupled, or uncoupled mode:*/

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

@@ -39 +39 @@
         /*Should we be here?:*/
         if(!isslr)return;
-
-        /*Verbose: */
-        if(VerboseSolution()) _printf0_("   computing sea level rise\n");
 
         /*Run gia core: */

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

@@ -221 +221 @@
                 thermal_core(femmodel);
         }
+
         /* Using Hydrology dc  coupled we need to compute smb in the hydrology inner time loop*/
         if(issmb) {
@@ -232 +233 @@
                 hydrology_core(femmodel);
                 femmodel->parameters->FindParam(&hydrology_model,HydrologyModelEnum);
-                if(hydrology_model!=HydrologydcEnum && issmb)smb_core(femmodel);
+                if(hydrology_model!=HydrologydcEnum && issmb) smb_core(femmodel);
         }
 
@@ -260 +261 @@
 
         if(isgroundingline){
-
-                /*Start profiler*/
-                femmodel->profiler->Start(GROUNDINGLINECORE);
-
                 if(VerboseSolution()) _printf0_("   computing new grounding line position\n");
-                GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-
-                femmodel->parameters->SetParam(MaskOceanLevelsetEnum,InputToExtrudeEnum);
-                extrudefrombase_core(femmodel);
-                femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum);
-                extrudefrombase_core(femmodel);
-                femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
-                extrudefrombase_core(femmodel);
-
-                /*Stop profiler*/
-                femmodel->profiler->Stop(GROUNDINGLINECORE);
-
-                if(save_results){
-                        int outputs[3] = {SurfaceEnum,BaseEnum,MaskOceanLevelsetEnum};
-                        femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);
-                }
+                groundingline_core(femmodel);
         }
 
@@ -296 +278 @@
 
         /*Sea level rise: */
-        if(isslr) sealevelchange_core(femmodel);
+        if(isslr){
+                if(VerboseSolution()) _printf0_("   computing sea level rise\n");
+                sealevelchange_core(femmodel);
+        }
 
 }/*}}}*/

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -10 +10 @@
 void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
-        int                 migration_style,analysis_type;
-        IssmDouble         *vertices_potentially_ungrounding = NULL;
-        IssmDouble         *phi_ungrounding                  = NULL;
-        Element            *element                          = NULL;
+   int         migration_style;
+        IssmDouble *vertices_potentially_ungrounding = NULL;
+        IssmDouble *phi_ungrounding                  = NULL;
 
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-
         if(migration_style==NoneEnum) return;
 
-        if(VerboseModule()) _printf0_("   Migrating grounding line\n");
+        if(VerboseModule()) _printf0_("   Migrating grounding line based on "<<EnumToStringx(migration_style)<<"\n");
 
         /*Set toolkit to default*/
@@ -47 +44 @@
         /*Migrate grounding line : */
         for(int i=0;i<elements->Size();i++){
-                element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
                 element->MigrateGroundingLine(phi_ungrounding);
         }