diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp index 6b1b8106542d4cd84539003afc47b8dbd3c8f778..539aa1113925e99a433456e33ef01f81a1ceec8a 100644 --- a/Fltk/Main.cpp +++ b/Fltk/Main.cpp @@ -59,9 +59,14 @@ int main(int argc, char *argv[]) // Non-interactive Gmsh if(CTX.batch) { - Msg::Info("'%s' started on %s", cmdline.c_str(), currtime.c_str()); + Msg::Info("Running '%s'", cmdline.c_str()); + Msg::Info("Started on %s", currtime.c_str()); GmshBatch(); GmshFinalize(); + time(&now); + currtime = ctime(&now); + currtime[currtime.size() - 1] = '\0'; + Msg::Info("Stopped on %s", currtime.c_str()); Msg::Exit(0); } diff --git a/Geo/MElement.h b/Geo/MElement.h index ba3892d1870fd9fa4c9c48b4f3f360d2c1550106..983bacb2f39b732c41083c075e4f909c2a75db14 100644 --- a/Geo/MElement.h +++ b/Geo/MElement.h @@ -2550,18 +2550,18 @@ class MPyramid : public MElement { virtual void getGradShapeFunctions(double u, double v, double w, double s[][3], int o) { if(w == 1.) { - s[0][0] = -0.25 ; - s[0][1] = -0.25 ; - s[0][2] = -0.25 ; - s[1][0] = 0.25 ; - s[1][1] = -0.25 ; - s[1][2] = -0.25 ; - s[2][0] = 0.25 ; - s[2][1] = 0.25 ; - s[2][2] = -0.25 ; - s[3][0] = -0.25 ; - s[3][1] = 0.25 ; - s[3][2] = -0.25 ; + s[0][0] = -0.25 ; + s[0][1] = -0.25 ; + s[0][2] = -0.25 ; + s[1][0] = 0.25 ; + s[1][1] = -0.25 ; + s[1][2] = -0.25 ; + s[2][0] = 0.25 ; + s[2][1] = 0.25 ; + s[2][2] = -0.25 ; + s[3][0] = -0.25 ; + s[3][1] = 0.25 ; + s[3][2] = -0.25 ; } else{ s[0][0] = 0.25 * ( -(1. - v) + v * w / (1. - w)) ;