Commit 2760047d authored by Iker Hurtado's avatar Iker Hurtado
Browse files

Minor changes

parent cd404da9
......@@ -53,8 +53,8 @@
let PubSub = __webpack_require__(5);
let Router = __webpack_require__(6);
let MaterialMod = __webpack_require__(7);
let SearchModule = __webpack_require__(32);
let UserGuidance = __webpack_require__(33);
let SearchModule = __webpack_require__(31);
let UserGuidance = __webpack_require__(32);
let DataStore = __webpack_require__(2);
let contentElement= document.getElementById("content");
......@@ -1429,8 +1429,8 @@
let StructureDetails = __webpack_require__(18);
let ElectronicStructDetails = __webpack_require__(23);
let MethodologyDetails = __webpack_require__(25);
let ThermalPropsDetails = __webpack_require__(28);
let ElasticConstDetails = __webpack_require__(31);
let ThermalPropsDetails = __webpack_require__(27);
let ElasticConstDetails = __webpack_require__(30);
let DataStore = __webpack_require__(2);
let LoadingPopup = __webpack_require__(3);
......@@ -3807,7 +3807,10 @@
}
setPoints(points){
setPoints(points, codeName){
let dosValueDivisor = E_FACTOR;
//if (codeName === 'VASP') dosValueDivisor = 1e-10*(E_FACTOR*E_FACTOR);
this.pointsSpin1 = [];
this.pointsSpin2 = [];
......@@ -3822,14 +3825,14 @@
for (var i = 0; i < pointsY.length; i++) {
let energy = pointsY[i]/E_FACTOR;
let dos_value_spin1 = pSpin1[i]/(E_FACTOR);
let dos_value_spin1 = pSpin1[i]/dosValueDivisor;
pointsXInPlotRange.push(dos_value_spin1);
if (pSpin2 !== null) pointsXInPlotRange.push(pSpin2[i]);
pointsYInPlotRange.push(energy);
//console.log('POINTS : ',pointsX[i], energy);
this.pointsSpin1.push({x: dos_value_spin1, y: energy});
if (pSpin2 !== null)
this.pointsSpin2.push({x: pSpin2[i]/(E_FACTOR), y: energy});
this.pointsSpin2.push({x: pSpin2[i]/dosValueDivisor, y: energy});
}
let maxDosVal = Math.max.apply(null, pointsXInPlotRange);
......@@ -5596,8 +5599,8 @@
this.spinLegend.style.display = 'block';
//***util.addBandGapData(calcData, bsData);
//console.log(calcData.dos_json);
this.bsDosPlotter.setUpAndData(bsData, dosData );
//console.log('CODE NAME:', calc.code_name);
this.bsDosPlotter.setUpAndData(bsData, dosData, calc.code_name );
if (calc.has_band_structure){
......@@ -5882,7 +5885,7 @@
}
setUpAndData(dispData, dosData){
setUpAndData(dispData, dosData, codeName){
this.hasDispData = (dispData !== undefined && dispData !== null);
this.hasDosData = (dosData !== undefined && dosData !== null);
......@@ -5913,7 +5916,7 @@
if (this.hasDosData){
this.dosPlotter.setPoints(dosData);
this.dosPlotter.setPoints(dosData, codeName);
if (this.hasDispData){
this.dosPlotter.setRepaintListener( (yZoom, yOffset) => {
......@@ -5955,7 +5958,7 @@
let InfoSys = __webpack_require__(11);
//let FilterInGroupsComponent = require('./FilterInGroupsComponent.js');
let DataStore = __webpack_require__(2);
let SortingButton = __webpack_require__(27);
let SortingButton = __webpack_require__(26);
const REPOSITORY_LINK =
......@@ -6317,6 +6320,14 @@
DataStore.getCalculations().forEach( c => {
/*let calc = DataStore.getCalc(DataStore.getCalcReprIntId(leafId));
let calcType = calc.run_type;
if (DataStore.getGroups().has(calc.id)){//leafId)){
calcType = DataStore.getGroupType(calc.id);//leafId);
if (calcType === 'convergence') calcType = 'parameter variation';
//console.log('Group',DataStore.getGroupType(leafId));
}*/
let calcType = c.run_type;
if (DataStore.getGroups().has(c.id)){//leafId)){
calcType = DataStore.getGroupType(c.id);//leafId);
......@@ -6358,15 +6369,6 @@
let html = '';
this.sortedCalcs.forEach( rowCalcData => { //leafId => {
/*let calc = DataStore.getCalc(DataStore.getCalcReprIntId(leafId));
let calcType = calc.run_type;
if (DataStore.getGroups().has(calc.id)){//leafId)){
calcType = DataStore.getGroupType(calc.id);//leafId);
if (calcType === 'convergence') calcType = 'parameter variation';
//console.log('Group',DataStore.getGroupType(leafId));
}*/
//html+= getRowHtml(leafId, calc, calcType);
html+= getRowHtml(rowCalcData);
});
......@@ -6454,8 +6456,7 @@
/***/ },
/* 26 */,
/* 27 */
/* 26 */
/***/ function(module, exports, __webpack_require__) {
......@@ -6506,7 +6507,7 @@
/***/ },
/* 28 */
/* 27 */
/***/ function(module, exports, __webpack_require__) {
......@@ -6519,8 +6520,8 @@
let LoadingPopup = __webpack_require__(3);
let HeatCapPlotter = __webpack_require__(16);
let HelmholtzPlotter = __webpack_require__(29);
let PhononDispDOSPlotter = __webpack_require__(30);
let HelmholtzPlotter = __webpack_require__(28);
let PhononDispDOSPlotter = __webpack_require__(29);
class ThermalPropsDetails extends DetailsViewBase{
......@@ -6701,7 +6702,7 @@
/***/ },
/* 29 */
/* 28 */
/***/ function(module, exports, __webpack_require__) {
"use strict";
......@@ -6756,7 +6757,7 @@
/***/ },
/* 30 */
/* 29 */
/***/ function(module, exports, __webpack_require__) {
......@@ -6916,7 +6917,7 @@
/***/ },
/* 31 */
/* 30 */
/***/ function(module, exports, __webpack_require__) {
......@@ -7021,17 +7022,17 @@
/***/ },
/* 32 */
/* 31 */
/***/ function(module, exports, __webpack_require__) {
"use strict";
let util = __webpack_require__(1);
let UserGuidance = __webpack_require__(33);
let ElementTable = __webpack_require__(34);
let MaterialList = __webpack_require__(35);
let PropertiesBox = __webpack_require__(36);
let UserGuidance = __webpack_require__(32);
let ElementTable = __webpack_require__(33);
let MaterialList = __webpack_require__(34);
let PropertiesBox = __webpack_require__(35);
function getTagHtml(tag, isFormula){
......@@ -7484,7 +7485,7 @@
/***/ },
/* 33 */
/* 32 */
/***/ function(module, exports) {
"use strict";
......@@ -7655,7 +7656,7 @@
/***/ },
/* 34 */
/* 33 */
/***/ function(module, exports, __webpack_require__) {
......@@ -8024,7 +8025,7 @@
/***/ },
/* 35 */
/* 34 */
/***/ function(module, exports, __webpack_require__) {
......@@ -8285,7 +8286,7 @@
/***/ },
/* 36 */
/* 35 */
/***/ function(module, exports, __webpack_require__) {
......
......@@ -32,7 +32,7 @@ class BSDOSPlotter{
}
setUpAndData(dispData, dosData){
setUpAndData(dispData, dosData, codeName){
this.hasDispData = (dispData !== undefined && dispData !== null);
this.hasDosData = (dosData !== undefined && dosData !== null);
......@@ -63,7 +63,7 @@ class BSDOSPlotter{
if (this.hasDosData){
this.dosPlotter.setPoints(dosData);
this.dosPlotter.setPoints(dosData, codeName);
if (this.hasDispData){
this.dosPlotter.setRepaintListener( (yZoom, yOffset) => {
......
......@@ -24,7 +24,10 @@ class DOSPlotter extends InteractivePlotterBase{
}
setPoints(points){
setPoints(points, codeName){
let dosValueDivisor = E_FACTOR;
//if (codeName === 'VASP') dosValueDivisor = 1e-10*(E_FACTOR*E_FACTOR);
this.pointsSpin1 = [];
this.pointsSpin2 = [];
......@@ -39,14 +42,14 @@ class DOSPlotter extends InteractivePlotterBase{
for (var i = 0; i < pointsY.length; i++) {
let energy = pointsY[i]/E_FACTOR;
let dos_value_spin1 = pSpin1[i]/(E_FACTOR);
let dos_value_spin1 = pSpin1[i]/dosValueDivisor;
pointsXInPlotRange.push(dos_value_spin1);
if (pSpin2 !== null) pointsXInPlotRange.push(pSpin2[i]);
pointsYInPlotRange.push(energy);
//console.log('POINTS : ',pointsX[i], energy);
this.pointsSpin1.push({x: dos_value_spin1, y: energy});
if (pSpin2 !== null)
this.pointsSpin2.push({x: pSpin2[i]/(E_FACTOR), y: energy});
this.pointsSpin2.push({x: pSpin2[i]/dosValueDivisor, y: energy});
}
let maxDosVal = Math.max.apply(null, pointsXInPlotRange);
......
......@@ -287,8 +287,8 @@ class ElectronicStructDetails extends DetailsViewBase{
this.spinLegend.style.display = 'block';
//***util.addBandGapData(calcData, bsData);
//console.log(calcData.dos_json);
this.bsDosPlotter.setUpAndData(bsData, dosData );
//console.log('CODE NAME:', calc.code_name);
this.bsDosPlotter.setUpAndData(bsData, dosData, calc.code_name );
if (calc.has_band_structure){
......
......@@ -368,6 +368,14 @@ class MethodologyDetails extends DetailsViewBase {
DataStore.getCalculations().forEach( c => {
/*let calc = DataStore.getCalc(DataStore.getCalcReprIntId(leafId));
let calcType = calc.run_type;
if (DataStore.getGroups().has(calc.id)){//leafId)){
calcType = DataStore.getGroupType(calc.id);//leafId);
if (calcType === 'convergence') calcType = 'parameter variation';
//console.log('Group',DataStore.getGroupType(leafId));
}*/
let calcType = c.run_type;
if (DataStore.getGroups().has(c.id)){//leafId)){
calcType = DataStore.getGroupType(c.id);//leafId);
......@@ -409,15 +417,6 @@ class MethodologyDetails extends DetailsViewBase {
let html = '';
this.sortedCalcs.forEach( rowCalcData => { //leafId => {
/*let calc = DataStore.getCalc(DataStore.getCalcReprIntId(leafId));
let calcType = calc.run_type;
if (DataStore.getGroups().has(calc.id)){//leafId)){
calcType = DataStore.getGroupType(calc.id);//leafId);
if (calcType === 'convergence') calcType = 'parameter variation';
//console.log('Group',DataStore.getGroupType(leafId));
}*/
//html+= getRowHtml(leafId, calc, calcType);
html+= getRowHtml(rowCalcData);
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment