Changeset 25811

Timestamp:

12/02/20 20:21:56 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on FISOC

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• main/esmfbinders.cpp (modified) (2 diffs)

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

@@ -1 @@
-AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@
+AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@
 AM_FCFLAGS = @SEMICINCL@
 
@@ -777 +777 @@
 
 #External packages
-LDADD += $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB)
+LDADD += $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(SEMICLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HDF5LIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADJOINTMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJLIB) $(ESMFLIB)
 
 if FORTRAN

issm/trunk-jpl/src/c/main/esmfbinders.cpp

@@ -4 +4 @@
 
 #include "./issm.h"
+#include <ESMC.h>
 
 /*GCM specific declarations:*/
@@ -154 +155 @@
 
         /*FISOC*/
+        void InitializeISSM_FISOC(int argc, char** argv,ISSM_MPI_Comm comm_init){ /*{{{*/
+
+      /*Intermediary*/
+                int rc;
+
+                /*Initialize femmodel from arguments provided command line: */
+                femmodel = new FemModel(argc,argv,comm_init);
+
+                /*Initialize ESMC Mesh*/
+                int pdim;        /*parametric dimension is the same as the domain dimensions */
+                int sdim = 3;    /*coordinates of each vertex is always 3                    */
+                ESMC_CoordSys_Flag coordsys = ESMC_COORDSYS_CART; /*Cartesian coordinate system by default                    */
+                femmodel->parameters->FindParam(&pdim,DomainDimensionEnum);
+                ESMC_Mesh mesh = ESMC_MeshCreate(pdim,sdim,&coordsys,&rc);
+                if(rc!=ESMF_SUCCESS) _error_("could not create EMSC_Mesh");
+
+                /*Some specific code here for the binding: */
+                _error_("not coded yet, will depend on what FISOC provides");
+                //femmodel->parameters->SetParam(SMBgcmEnum,SmbEnum); /*bypass SMB model, will be provided by GCM*/
+
+                /*Create restart file for later */
+                femmodel->Restart();
+        } /*}}}*/
 
 }