Changeset 27869

Timestamp:

08/03/23 02:23:06 (20 months ago)

Author:

seroussi

Message:

CHG: updated MITgcm coupling to allow cartesian and polar coordinates

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (3 diffs)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• modules/OceanExchangeDatax/OceanExchangeDatax.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp ¶

@@ -118 +118 @@
         bool   isgroundingline;
         bool   ismovingfront;
-        bool   isoceancoupling;
         bool   issmb;
+        int    isoceancoupling;
         int    grdmodel;
 

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

@@ -129 +129 @@
         /*parameters: */
         bool isstressbalance,ismasstransport,isage,isoceantransport,issmb,isthermal,isgroundingline,isesa,issampling;
-        bool isslc,ismovingfront,isdamageevolution,ishydrology,isoceancoupling,isstochasticforcing,save_results;
+        bool isslc,ismovingfront,isdamageevolution,ishydrology,isstochasticforcing,save_results;
         bool isdebris;
-        int  step,sb_coupling_frequency;
+        int  step,sb_coupling_frequency,isoceancoupling;
         int  domaintype,numoutputs;
 
@@ -250 +250 @@
 void transient_precore(FemModel* femmodel){/*{{{*/
 
-        bool       isoceancoupling,isslc;
-        int        amr_frequency,amr_restart;
+        bool       isslc;
+        int        amr_frequency,amr_restart,isoceancoupling;
 
         femmodel->parameters->FindParam(&isoceancoupling,TransientIsoceancouplingEnum);
@@ -278 +278 @@
         /*parameters: */
         IssmDouble finaltime,dt,yts,time;
-        bool       isoceancoupling;
-        int        step,timestepping;
-        int        checkpoint_frequency,num_responses;
+        int       isoceancoupling;
+        int       step,timestepping;
+        int       checkpoint_frequency,num_responses;
         int              *M = NULL;
         int              *control_enum;

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp ¶

@@ -453 +453 @@
         if(solution_type!=LoveSolutionEnum) CreateNumberNodeToElementConnectivity(iomodel);
         if(!isamr){
-                bool isoceancoupling;
+                int isoceancoupling;
                 iomodel->FindConstant(&isoceancoupling,"md.transient.isoceancoupling");
 

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

@@ -22 +22 @@
         tomitgcmcomm=parcom->GetParameterValue();
 
-        int oceangridnxsize,oceangridnysize,ngrids_ocean,nels_ocean;
+        int oceangridnxsize,oceangridnysize,ngrids_ocean,nels_ocean,isoceancoupling;
         IssmDouble  oceantime,coupling_time,time,yts;
         IssmDouble rho_ice;
@@ -45 +45 @@
         femmodel->parameters->FindParam(&coupling_time,TimesteppingCouplingTimeEnum);
         femmodel->parameters->FindParam(&time,TimeEnum);
+        femmodel->parameters->FindParam(&isoceancoupling,TransientIsoceancouplingEnum);
 
         /*Exchange or recover mesh and inputs needed*/
@@ -81 +82 @@
         femmodel->GetMesh(femmodel->vertices,femmodel->elements,&x_ice,&y_ice,&index_ice);
         BamgTriangulatex(&index_ocean,&nels_ocean,oceangridx,oceangridy,ngrids_ocean);
-        femmodel->vertices->XYList(&lon_ice,&lat_ice);
-        //femmodel->vertices->LatLonList(&lat_ice,&lon_ice);
+        if(isoceancoupling==2){
+                femmodel->vertices->LatLonList(&lat_ice,&lon_ice);
+        }
+        else{
+                femmodel->vertices->XYList(&lon_ice,&lat_ice);
+        }
         GetVectorFromInputsx(&icethickness,femmodel,ThicknessEnum,VertexSIdEnum);
         Options* options = new Options();