Changeset 27818

Timestamp:

06/30/23 18:10:25 (21 months ago)

Author:

seroussi

Message:

NEW: changing coupling scheme

Location:

issm/trunk-jpl/src/c

Files:

• cores/transient_core.cpp (modified) (1 diff)
• modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (modified) (1 diff)
• modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (modified) (1 diff)
• modules/OceanExchangeDatax/OceanExchangeDatax.cpp (modified) (1 diff)

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

@@ -199 +199 @@
                  * then receive ocean melt 
                  * then go back to the previous geometry to continue the transient with the melt received*/
-                InputUpdateFromConstantx(femmodel,0.,BasalforcingsFloatingiceMeltingRateEnum);
+                InputUpdateFromConstantx(femmodel,0.,BasalforcingsFloatingiceMeltingRateEnum,P1Enum);
                 masstransport_core(femmodel);
                 OceanExchangeDatax(femmodel,false);

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

@@ -26 +26 @@
                 element->InputUpdateFromConstant(constant,name);
         }
+}
+void InputUpdateFromConstantx(FemModel* femmodel,int constant, int name, int type){
+
+        if(type==P0Enum) InputUpdateFromConstantx(femmodel, constant,name);
+        else if(type==P1Enum){
+
+                if(VerboseModule()) _printf0_("   Input updates from constant (P1 version)\n");
+
+                /*Elements and loads drive the update: */
+                if(IsInputEnum(name)){
+                        for(Object* & object : femmodel->elements->objects){
+                                Element* element = xDynamicCast<Element*>(object);
+                                element->InputUpdateFromConstant(constant,name,P1Enum);
+                        }
+                }
+                else{
+                        _error_("not supported yet");
+                }
+        }
+        else _error_("InputUpdateFromConstantx error message: type not supported yet!");
+
 }
 

issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h

@@ -12 +12 @@
 void InputUpdateFromConstantx(FemModel* femmodel,bool       constant,int name);
 void InputUpdateFromConstantx(FemModel* femmodel,int        constant,int name);
+void InputUpdateFromConstantx(FemModel* femmodel,int        constant,int name, int type);
 void InputUpdateFromConstantx(FemModel* femmodel,IssmDouble constant,int name);
 #ifdef _HAVE_AD_

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

@@ -130 +130 @@
                 femmodel->parameters->FindParam(&yts,ConstantsYtsEnum);
                 if(my_rank==0){
+                        ISSM_MPI_Send(icethickness_oceangrid,ngrids_ocean,ISSM_MPI_DOUBLE,0,10001008,tomitgcmcomm);
                         ISSM_MPI_Send(&time,1,ISSM_MPI_DOUBLE,0,10001001,tomitgcmcomm);
                         ISSM_MPI_Recv(&oceantime,1,ISSM_MPI_DOUBLE,0,10001002,tomitgcmcomm,&status);
                         if((oceantime - time > 0.1*yts) & (oceantime - time < -0.1*yts)) _error_("Ocean and ice time are starting to diverge");
                         oceanmelt = xNew<IssmDouble>(ngrids_ocean);
-                        ISSM_MPI_Send(icethickness_oceangrid,ngrids_ocean,ISSM_MPI_DOUBLE,0,10001008,tomitgcmcomm);
                         ISSM_MPI_Recv(oceanmelt,ngrids_ocean,ISSM_MPI_DOUBLE,0,10001007,tomitgcmcomm,&status);
                 }