Changeset 084a836 in OpenModelica for Compiler/FrontEnd/InstUtil.mo

Timestamp:

2016-02-10T15:49:38+01:00 (8 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

c1ec6d8f

Parents:

a384029e

git-author:

Jan Šilar <jan.silar@…> (11/09/15 12:26:02)

git-committer:

hudson <openmodelica@…> (02/10/16 15:49:38)

Message:

PDE

boundary conditions, equations containing coordinates

File:

• Compiler/FrontEnd/InstUtil.mo (modified) (6 diffs)

Compiler/FrontEnd/InstUtil.mo

@@ -8944 +8944 @@
           (N,fieldLst) = getDomNFields(inDomFieldLst,domainCr,info);
         then list(newEQFun(i, lhs_exp, rhs_exp, domainCr, comment, info, fieldLst) for i in 2:N-1);
+      //same as previous but with ".interior"
       case SCode.EQUATION(SCode.EQ_EQUALS(expLeft = lhs_exp, expRight = rhs_exp,
                   domainOpt = SOME(domainCr as Absyn.CREF_QUAL(name, subscripts, Absyn.CREF_IDENT(name="interior"))),
@@ -8951 +8952 @@
           (N,fieldLst) = getDomNFields(inDomFieldLst,domainCr1,info);
         then list(newEQFun(i, lhs_exp, rhs_exp, domainCr1, comment, info, fieldLst) for i in 2:N-1);
+      //left boundary condition
+      case SCode.EQUATION(SCode.EQ_EQUALS(expLeft = lhs_exp, expRight = rhs_exp,
+                  domainOpt = SOME(domainCr as Absyn.CREF_QUAL(name, subscripts, Absyn.CREF_IDENT(name="left"))),
+                  comment = comment, info = info))
+        equation
+          domainCr1 = Absyn.CREF_IDENT(name, subscripts);
+          (N,fieldLst) = getDomNFields(inDomFieldLst,domainCr1,info);
+        then
+          {newEQFun(1, lhs_exp, rhs_exp, domainCr1, comment, info, fieldLst)};
+      //right boundary condition
+      case SCode.EQUATION(SCode.EQ_EQUALS(expLeft = lhs_exp, expRight = rhs_exp,
+                  domainOpt = SOME(domainCr as Absyn.CREF_QUAL(name, subscripts, Absyn.CREF_IDENT(name="right"))),
+                  comment = comment, info = info))
+        equation
+          domainCr1 = Absyn.CREF_IDENT(name, subscripts);
+          (N,fieldLst) = getDomNFields(inDomFieldLst,domainCr1,info);
+        then
+          {newEQFun(N, lhs_exp, rhs_exp, domainCr1, comment, info, fieldLst)};
+
     end matchcontinue;
 
@@ -9038 +9058 @@
    protected Boolean skip, failVar;
    protected Absyn.ComponentRef domainCr;
+   protected Absyn.Ident domName;
  algorithm
    failVar := false;
    (i, fieldLst, domainCr, info, skip) := inTup;
+   Absyn.CREF_IDENT(name = domName) := domainCr;
    if skip then
      outExp := inExp;
@@ -9051 +9073 @@
        list<Absyn.Subscript> subscripts;
        Absyn.ComponentRef fieldCr;
-
+     case  Absyn.CREF(Absyn.CREF_QUAL(name = domName, subscripts = {}, componentRef=Absyn.CREF_IDENT(name="x",subscripts={})))
+       //coordinate x
+       then
+         Absyn.CREF(Absyn.CREF_QUAL(name = domName, subscripts = {}, componentRef=Absyn.CREF_IDENT(name="x",subscripts = {Absyn.SUBSCRIPT(Absyn.INTEGER(i))})));
      case Absyn.CREF(fieldCr as Absyn.CREF_IDENT(name, subscripts))
        //field
        equation
-       if not List.isMemberOnTrue(fieldCr,fieldLst,Absyn.crefEqual) then
-         failVar = true;
-         Error.addSourceMessageAndFail(Error.COMPILER_ERROR,{"Field variable ",  name, " has different domain than the equation."}, info);
-       end if;
+       true = List.isMemberOnTrue(fieldCr,fieldLst,Absyn.crefEqual);
        then
           Absyn.CREF(Absyn.CREF_IDENT(name, Absyn.SUBSCRIPT(Absyn.INTEGER(i))::subscripts));
@@ -9066 +9088 @@
          if not List.isMemberOnTrue(fieldCr,fieldLst,Absyn.crefEqual) then
            failVar = true;
-           Error.addSourceMessageAndFail(Error.COMPILER_ERROR,{"Field variable ",  name, " has different domain than the equation or is not a field." }, info);
+           Error.addSourceMessageAndFail(Error.COMPILER_ERROR,{"Field variable '" +  name + "' has different domain than the equation or is not a field." }, info);
          end if;
          skip = true;
@@ -9080 +9102 @@
                    Absyn.INTEGER(2),
                    Absyn.MUL(),
-                   Absyn.CREF(Absyn.CREF_QUAL("omega"/*fieldDomainName*/,{},Absyn.CREF_IDENT("dx",{})))
+                   Absyn.CREF(Absyn.CREF_QUAL(domName,{},Absyn.CREF_IDENT("dx",{})))
            )
          );