ngsolve 6.2.2501.post39.dev1__cp310-cp310-win_amd64.whl → 6.2.2501.post60.dev1__cp310-cp310-win_amd64.whl

netgen/include/coefficient.hpp

@@ -1293,11 +1293,24 @@ public:
   
   virtual shared_ptr<CoefficientFunction>
   Diff (const CoefficientFunction * var, shared_ptr<CoefficientFunction> dir) const override
-  { throw Exception ("unarycf "+name+" does not provide a derivative"); }
+  {
+    if (this == var) return dir;
+    return CWMult (lam.Diff(c1), c1->Diff(var, dir));
+    
+    // throw Exception ("unarycf "+name+" does not provide a derivative");
+  }
 
   virtual shared_ptr<CoefficientFunction>
   DiffJacobi (const CoefficientFunction * var, T_DJC & cache) const override
-  { return BASE::DiffJacobi(var, cache); }
+  {
+    if (this == var) return make_shared<ConstantCoefficientFunction> (1);
+    if (this->Dimensions().Size() == 0)
+      return lam.Diff(c1) * c1->DiffJacobi(var, cache);
+    else
+      return MakeMultDiagMatCoefficientFunction (lam.Diff(c1), 
+                                             c1->DiffJacobi(var, cache));
+    // return BASE::DiffJacobi(var, cache);
+  }
 
   
   /*
@@ -1775,6 +1788,16 @@ INLINE shared_ptr<CoefficientFunction> BinaryOpCF(shared_ptr<CoefficientFunction
                                             shared_ptr<CoefficientFunction> vec,
                                             int index);
 
+  // diag(c1) * c2
+  // general tensor (TODO)
+  // C = A*B in sense of
+  // C_ijk = A_ij B_ik
+  //  with i.. single index, and j,k multi-index
+  NGS_DLL_HEADER shared_ptr<CoefficientFunction>
+  MakeMultDiagMatCoefficientFunction (shared_ptr<CoefficientFunction> c1,
+                                  shared_ptr<CoefficientFunction> c2);
+
+
   NGS_DLL_HEADER shared_ptr<CoefficientFunction>
   MakeCoordinateCoefficientFunction (int comp);
 
@@ -1848,6 +1871,10 @@ INLINE shared_ptr<CoefficientFunction> BinaryOpCF(shared_ptr<CoefficientFunction
   NGS_DLL_HEADER
   shared_ptr<CoefficientFunction> UnitVectorCF (int dim, int coord);
 
+  NGS_DLL_HEADER
+  shared_ptr<CoefficientFunction> OneVectorCF (FlatArray<int> dims);
+
+
   NGS_DLL_HEADER
   shared_ptr<CoefficientFunction> LeviCivitaCF(int dimension);
 

netgen/include/coefficient_impl.hpp

@@ -10,6 +10,7 @@ namespace ngfem
   {
     template <typename T> T operator() (T x) const { return x; }
     static string Name() { return  " "; }
+    template <typename T> T Diff (T x) const { throw Exception("no GenericIdentity::Diff"); }        
     void DoArchive(Archive& ar) {}
   };
 

netgen/include/coefficient_stdmath.hpp

@@ -13,12 +13,14 @@ namespace ngfem
   
   struct GenericSin {
     template <typename T> T operator() (T x) const { return sin(x); }
+    template <typename T> T Diff (T x) const { return cos(x); }    
     static string Name() { return "sin"; }
     void DoArchive(Archive& ar) {}
   };
 
   struct GenericCos {
     template <typename T> T operator() (T x) const { return cos(x); }
+    template <typename T> T Diff (T x) const { return -sin(x); }    
     static string Name() { return "cos"; }
     void DoArchive(Archive& ar) {}
   };
@@ -52,12 +54,14 @@ namespace ngfem
 
   struct GenericSinh {
     template <typename T> T operator() (T x) const { return sinh(x); }
+    template <typename T> T Diff (T x) const { return cosh(x); }            
     static string Name() { return "sinh"; }
     void DoArchive(Archive& ar) {}
   };
   
   struct GenericCosh {
     template <typename T> T operator() (T x) const { return cosh(x); }
+    template <typename T> T Diff (T x) const { return sinh(x); }        
     static string Name() { return "cosh"; }
     void DoArchive(Archive& ar) {}
   };
@@ -66,6 +70,7 @@ namespace ngfem
 
   struct GenericExp {
     template <typename T> T operator() (T x) const { return exp(x); }
+    template <typename T> T Diff (T x) const { return exp(x); }
     static string Name() { return "exp"; }
     void DoArchive(Archive& ar) {}
   };
@@ -73,6 +78,9 @@ namespace ngfem
   struct GenericLog {
     template <typename T> T operator() (T x) const { return log(x); }
     static string Name() { return "log"; }
+    auto Diff (shared_ptr<CoefficientFunction> x) const {
+      return OneVectorCF(x->Dimensions()) / x;
+    }    
     void DoArchive(Archive& ar) {}
   };
 
@@ -94,6 +102,7 @@ struct GenericFloor {
   SIMD<Complex> operator() (SIMD<Complex> x) const { throw ExceptionNOSIMD("no floor for simd"); }  
   // AutoDiff<1> operator() (AutoDiff<1> x) const { throw Exception("no floor for AD"); }
   AutoDiffDiff<1> operator() (AutoDiffDiff<1> x) const { throw Exception("no floor for ADD"); }
+  template <typename T> T Diff (T x) const { throw Exception("Generic Floor not differentiable"); }  
   static string Name() { return "floor"; }
   void DoArchive(Archive& ar) {}
 };
@@ -104,6 +113,7 @@ struct GenericCeil {
   SIMD<Complex> operator() (SIMD<Complex> x) const { throw ExceptionNOSIMD("no ceil for simd"); }  
   // AutoDiff<1> operator() (AutoDiff<1> x) const { throw Exception("no ceil for AD"); }
   AutoDiffDiff<1> operator() (AutoDiffDiff<1> x) const { throw Exception("no ceil for ADD"); }
+  template <typename T> T Diff (T x) const { throw Exception("Generic Ceil not differentiable"); }    
   static string Name() { return "ceil"; }
   void DoArchive(Archive& ar) {}
 };