Menu
▾
▴
vapor-cvs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(11) |
Sep
(23) |
Oct
(56) |
Nov
(57) |
Dec
(51) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(156) |
Feb
(153) |
Mar
(83) |
Apr
(27) |
May
(35) |
Jun
(32) |
Jul
(94) |
Aug
(133) |
Sep
(42) |
Oct
(91) |
Nov
(22) |
Dec
(97) |
| 2008 |
Jan
(51) |
Feb
(9) |
Mar
(45) |
Apr
(103) |
May
(104) |
Jun
(29) |
Jul
(19) |
Aug
(54) |
Sep
(46) |
Oct
(79) |
Nov
(124) |
Dec
(46) |
| 2009 |
Jan
(14) |
Feb
(32) |
Mar
(114) |
Apr
(79) |
May
(87) |
Jun
(98) |
Jul
(97) |
Aug
(15) |
Sep
(41) |
Oct
(17) |
Nov
(8) |
Dec
(58) |
| 2010 |
Jan
(157) |
Feb
(101) |
Mar
(38) |
Apr
|
May
(51) |
Jun
(100) |
Jul
(21) |
Aug
(69) |
Sep
(144) |
Oct
(109) |
Nov
(125) |
Dec
(50) |
| 2011 |
Jan
(25) |
Feb
|
Mar
(34) |
Apr
(25) |
May
(28) |
Jun
(20) |
Jul
(66) |
Aug
(40) |
Sep
(18) |
Oct
(10) |
Nov
(16) |
Dec
(44) |
| 2012 |
Jan
(23) |
Feb
(34) |
Mar
(51) |
Apr
(32) |
May
(40) |
Jun
(20) |
Jul
(41) |
Aug
(45) |
Sep
(59) |
Oct
(64) |
Nov
(65) |
Dec
(25) |
| 2013 |
Jan
(65) |
Feb
(14) |
Mar
(2) |
Apr
(10) |
May
(113) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: clynejp <cl...@us...> - 2013-05-30 16:43:40
|
Update of /cvsroot/vapor/vapor/share/doc/man In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15359 Modified Files: momvdfcreate.pod romsvdfcreate.pod Log Message: Removed erroneous "-level 2" option from examples Index: romsvdfcreate.pod =================================================================== RCS file: /cvsroot/vapor/vapor/share/doc/man/romsvdfcreate.pod,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** romsvdfcreate.pod 16 May 2013 20:28:08 -0000 1.2 --- romsvdfcreate.pod 30 May 2013 16:43:37 -0000 1.3 *************** *** 70,74 **** The command ! romsvdfcreate -vars u:v:temp -level 2 roms1.nc roms2.nc roms3.nc romsgrid.nc mydata.vdf will construct a VDF file, B<mydata.vdf> that will contain the B<u>, --- 70,74 ---- The command ! romsvdfcreate -vars u:v:temp roms1.nc roms2.nc roms3.nc romsgrid.nc mydata.vdf will construct a VDF file, B<mydata.vdf> that will contain the B<u>, Index: momvdfcreate.pod =================================================================== RCS file: /cvsroot/vapor/vapor/share/doc/man/momvdfcreate.pod,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** momvdfcreate.pod 16 May 2013 20:28:08 -0000 1.3 --- momvdfcreate.pod 30 May 2013 16:43:37 -0000 1.4 *************** *** 67,71 **** The command ! momvdfcreate -vars u:v:time -level 2 mom1.nc mom2.nc mom3.nc mydata.vdf will construct a VDF file, B<mydata.vdf> that will contain the B<u>, --- 67,71 ---- The command ! momvdfcreate -vars u:v:time mom1.nc mom2.nc mom3.nc mydata.vdf will construct a VDF file, B<mydata.vdf> that will contain the B<u>, |
|
From: Alan N. <ala...@us...> - 2013-05-29 14:43:28
|
Update of /cvsroot/vapor/vapor/make/win32/installx64 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27520/make/win32/installx64 Modified Files: installx64.vdproj Log Message: Update to 64bit installer Index: installx64.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/installx64.vdproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** installx64.vdproj 24 May 2013 20:43:11 -0000 1.6 --- installx64.vdproj 29 May 2013 14:43:25 -0000 1.7 *************** *** 682,685 **** --- 682,697 ---- "Entry" { + "MsmKey" = "8:_0A9D401D47AD1BEF64C715874E34DDAF" + "OwnerKey" = "8:_0CAB6645FD21421E85C1AB5FBC29BF64" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0A9D401D47AD1BEF64C715874E34DDAF" [...1488 lines suppressed...] "AspNetVersion" = "8:4.0.30319.0" --- 67643,67647 ---- "ProductName" = "8:VAPOR" "ProductCode" = "8:{39315C4D-F4AA-441E-AE2B-2CC06FEB7F27}" ! "PackageCode" = "8:{86FD1EDB-2C75-4A92-8796-7D5B9EACFD98}" "UpgradeCode" = "8:{90D1C324-DDA2-4EC4-8710-412094C25649}" "AspNetVersion" = "8:4.0.30319.0" *************** *** 67773,67777 **** "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DBD2C17F0059407CB1ED013135FC190E" { "UseDynamicProperties" = "11:TRUE" --- 68169,68173 ---- "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_612476E078D94E978B2132D846C1B889" { "UseDynamicProperties" = "11:TRUE" |
|
From: Alan N. <ala...@us...> - 2013-05-29 14:09:23
|
Update of /cvsroot/vapor/vapor/apps/vaporgui/guis In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25323/apps/vaporgui/guis Modified Files: floweventrouter.cpp Log Message: Extended range of smoothness slider to 10000, fixing unreported bug. Index: floweventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/floweventrouter.cpp,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** floweventrouter.cpp 25 Jan 2013 23:35:37 -0000 1.157 --- floweventrouter.cpp 29 May 2013 14:09:20 -0000 1.158 *************** *** 615,619 **** if (autoScale){ float sampleRate = fParams->getSteadySmoothness(); ! int sval = (int)(0.5f+256.0*(log10((float)sampleRate)+1.f)*0.25f); if (smoothnessSlider->value() != sval) smoothnessSlider->setValue(sval); --- 615,619 ---- if (autoScale){ float sampleRate = fParams->getSteadySmoothness(); ! int sval = (int)(0.5f+256.0*(log10((float)sampleRate))*0.25f); if (smoothnessSlider->value() != sval) smoothnessSlider->setValue(sval); *************** *** 679,683 **** if (autoScale){ float sampleRate = fParams->getSteadySmoothness(); ! int sval = (int)(0.5f+256.0*(log10((float)sampleRate)+1.f)*0.25f); if (smoothnessSlider->value()!= sval) smoothnessSlider->setValue(sval); --- 679,683 ---- if (autoScale){ float sampleRate = fParams->getSteadySmoothness(); ! int sval = (int)(0.5f+256.0*(log10((float)sampleRate))*0.25f); if (smoothnessSlider->value()!= sval) smoothnessSlider->setValue(sval); *************** *** 928,945 **** float len = steadyLengthEdit->text().toFloat(); //First make sure they fit within bounds of sliders: ! if (steadySmoothness < .1f){ ! steadySmoothness = .1f; changed = true; } ! if (steadySmoothness > 1000.f){ ! steadySmoothness = 1000.f; changed = true; } ! if (len < 0.01f) { ! len = 0.01f; changed = true; } ! if (len > 100.f){ ! len = 100.f; changed = true; } --- 928,945 ---- float len = steadyLengthEdit->text().toFloat(); //First make sure they fit within bounds of sliders: ! if (steadySmoothness < .001f){ ! steadySmoothness = .001f; changed = true; } ! if (steadySmoothness > 100000.f){ ! steadySmoothness = 100000.f; changed = true; } ! if (len < 0.0001f) { ! len = 0.0001f; changed = true; } ! if (len > 10000.f){ ! len = 10000.f; changed = true; } *************** *** 958,962 **** guiSetTextChanged(false); } ! int sval = (int)(0.5f+256.0*(log10((float)steadySmoothness)+1.f)*0.25f); if (sval != smoothnessSlider->value()) smoothnessSlider->setValue(sval); --- 958,962 ---- guiSetTextChanged(false); } ! int sval = (int)(0.5f+256.0*(log10((float)steadySmoothness))*0.25f); if (sval != smoothnessSlider->value()) smoothnessSlider->setValue(sval); *************** *** 1952,1956 **** VizWinMgr::getInstance()->setFlowDataDirty(fParams); } ! //Slider sets the smoothness, between 1 and 1000.0 //This determines the number of samples per domain diameter, //Can be between 1 and 10000 --- 1952,1956 ---- VizWinMgr::getInstance()->setFlowDataDirty(fParams); } ! //Slider sets the smoothness, between 1 and 10000.0 //This determines the number of samples per domain diameter, //Can be between 1 and 10000 *************** *** 1964,1968 **** float s = ((float)(sliderPos))/256.f; // between 0 and 1 bool changed = false; ! float sfactor = pow(10.f,s*4.f -1.f); //between .1 and 1000 //Make sure flowLen*smoothness is between 2 and 10000 float steadyLen = fParams->getSteadyFlowLength(); --- 1964,1968 ---- float s = ((float)(sliderPos))/256.f; // between 0 and 1 bool changed = false; ! float sfactor = pow(10.f,s*4.f ); //between 1 and 10000 //Make sure flowLen*smoothness is between 2 and 10000 float steadyLen = fParams->getSteadyFlowLength(); *************** *** 1976,1980 **** } if (changed) ! smoothnessSlider->setValue((int)(0.5f+256.0*(log10(sfactor)+1.f)*0.25f)); fParams->setSteadySmoothness(sfactor); smoothnessSamplesEdit->setText(QString::number(sfactor)); --- 1976,1980 ---- } if (changed) ! smoothnessSlider->setValue((int)(0.5f+256.0*(log10(sfactor))*0.25f)); fParams->setSteadySmoothness(sfactor); smoothnessSamplesEdit->setText(QString::number(sfactor)); |
|
From: clynejp <cl...@us...> - 2013-05-28 21:45:46
|
Update of /cvsroot/vapor/vapor/lib/render In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5048 Modified Files: flowrenderer.cpp Log Message: Fixed 3613859 - Clipping planes to tight Index: flowrenderer.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/lib/render/flowrenderer.cpp,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** flowrenderer.cpp 22 Jan 2013 22:12:30 -0000 1.105 --- flowrenderer.cpp 28 May 2013 21:45:44 -0000 1.106 *************** *** 295,300 **** glPushMatrix(); ! //Set up clipping planes on subvolume in unit box: ! enableRegionClippingPlanes(); //Apply a coord transform that moves the full user-coord region to the unit cube, --- 295,299 ---- glPushMatrix(); ! //Apply a coord transform that moves the full user-coord region to the unit cube, *************** *** 319,322 **** --- 318,336 ---- arrowHeadRadius = (myFlowParams->getArrowDiameter())*userRadius; + // Set up clipping planes. Clip to region bounds, adding padding + // to handle any geometry from the rendering primitives that escape + // the box. Fixes 3613859 + // + // enableRegionClippingPlanes(); + double regExts[6]; + RegionParams* rParams = myGLWindow->getActiveRegionParams(); + rParams->GetBox()->GetUserExtents(regExts,currentFrameNum); + float r = max(stationaryRadius, max(userRadius, arrowHeadRadius)); + for (int i=0; i<3; i++) { + regExts[i] -= r; + regExts[i+3] += r; + } + enableClippingPlanes(regExts); + //If we are doing unsteady flow, handle setup differently: |
|
From: clynejp <cl...@us...> - 2013-05-24 21:38:32
|
Update of /cvsroot/vapor/vapor/apps/ncdf2vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9432 Modified Files: ncdf2vdf.cpp Log Message: time comparison between vdc and netCDF times was not correct Index: ncdf2vdf.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/ncdf2vdf/ncdf2vdf.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** ncdf2vdf.cpp 24 May 2013 19:36:49 -0000 1.28 --- ncdf2vdf.cpp 24 May 2013 21:38:29 -0000 1.29 *************** *** 117,121 **** // Get user times from .vdf // ! vector <double> ncdftimes; for (int i=0; i<ncdfData->GetNumTimeSteps(); i++) { ncdftimes.push_back(ncdfData->GetTSUserTime(i)); --- 117,121 ---- // Get user times from .vdf // ! vector <float> ncdftimes; for (int i=0; i<ncdfData->GetNumTimeSteps(); i++) { ncdftimes.push_back(ncdfData->GetTSUserTime(i)); *************** *** 125,129 **** // Get user times from netCDF files // ! vector <double> vdctimes; for (int i=0; i<vdfio->GetNumTimeSteps(); i++) { vdctimes.push_back(vdfio->GetTSUserTime(i)); --- 125,129 ---- // Get user times from netCDF files // ! vector <float> vdctimes; for (int i=0; i<vdfio->GetNumTimeSteps(); i++) { vdctimes.push_back(vdfio->GetTSUserTime(i)); *************** *** 137,145 **** // Cross-reference ncdf and vdc times // ! double ncdftime; for (int i=startts; i<numts && i<ncdfData->GetNumTimeSteps(); i++) { ncdftime = ncdftimes[i]; ! vector <double>::iterator itr = find( vdctimes.begin(), vdctimes.end(), ncdftime ); --- 137,145 ---- // Cross-reference ncdf and vdc times // ! float ncdftime; for (int i=startts; i<numts && i<ncdfData->GetNumTimeSteps(); i++) { ncdftime = ncdftimes[i]; ! vector <float>::iterator itr = find( vdctimes.begin(), vdctimes.end(), ncdftime ); |
|
From: Alan N. <ala...@us...> - 2013-05-24 20:47:52
|
Update of /cvsroot/vapor/vapor/make/win32/installer In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7422 Modified Files: installer.vdproj Log Message: 32-bit installer update Index: installer.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installer/installer.vdproj,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** installer.vdproj 22 May 2013 17:52:08 -0000 1.69 --- installer.vdproj 24 May 2013 20:47:48 -0000 1.70 *************** *** 4756,4759 **** --- 4756,4771 ---- "Entry" { + "MsmKey" = "8:_26B97EB4BB733733E2F949FB87074991" + "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_26B97EB4BB733733E2F949FB87074991" + "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_26EA436D08AF477BBDC420D0BF801E2D" "OwnerKey" = "8:_UNDEFINED" *************** *** 6604,6607 **** --- 6616,6631 ---- "Entry" { + "MsmKey" = "8:_3674668821FFAEEEBD58449CCB8D5A28" + "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3674668821FFAEEEBD58449CCB8D5A28" + "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_369950B4E88B4A4686E83EA957EB2E79" "OwnerKey" = "8:_UNDEFINED" *************** *** 8158,8161 **** --- 8182,8197 ---- "Entry" { + "MsmKey" = "8:_42B4DC5679BA43FA90E57B9F174FCD2B" + "OwnerKey" = "8:_24A4C611571A453DB9474E2AD9DD3DC3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_42B4DC5679BA43FA90E57B9F174FCD2B" + "OwnerKey" = "8:_80BE7F93190D4B978B038E5F92F19EA0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_42BAE17565B344D18D25A5E315ABC8B4" "OwnerKey" = "8:_UNDEFINED" *************** *** 9790,9811 **** "Entry" { - "MsmKey" = "8:_51F6C6D7D149716E8CCD6DD9EB3A571C" - "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_51F6C6D7D149716E8CCD6DD9EB3A571C" - "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_51F6C6D7D149716E8CCD6DD9EB3A571C" - "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_51FEF0DD032A47D4B086DF61540B91C4" "OwnerKey" = "8:_UNDEFINED" --- 9826,9829 ---- *************** *** 10312,10333 **** "Entry" { - "MsmKey" = "8:_5633B0A50C73B05E02986B83A6FCF541" - "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5633B0A50C73B05E02986B83A6FCF541" - "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5633B0A50C73B05E02986B83A6FCF541" - "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5639F40309794DB081474E080D3F2348" "OwnerKey" = "8:_UNDEFINED" --- 10330,10333 ---- *************** *** 14494,14497 **** --- 14494,14515 ---- "Entry" { + "MsmKey" = "8:_7A9EC1BABDB3397850D9D7E9C31F6D2C" + "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7A9EC1BABDB3397850D9D7E9C31F6D2C" + "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7A9EC1BABDB3397850D9D7E9C31F6D2C" + "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7ACBA9C28B9C42A18AFD3F39CF9D3875" "OwnerKey" = "8:_UNDEFINED" *************** *** 14554,14569 **** "Entry" { - "MsmKey" = "8:_7B39A3675472C7ED0EFBE39B578C6E0F" - "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7B39A3675472C7ED0EFBE39B578C6E0F" - "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7B48E02A52024ADAAC3AE890DCE7D3C6" "OwnerKey" = "8:_UNDEFINED" --- 14572,14575 ---- *************** *** 14872,14887 **** "Entry" { - "MsmKey" = "8:_7DEA34C77F97C94A9F2A5DDC1ACB17BF" - "OwnerKey" = "8:_24A4C611571A453DB9474E2AD9DD3DC3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7DEA34C77F97C94A9F2A5DDC1ACB17BF" - "OwnerKey" = "8:_80BE7F93190D4B978B038E5F92F19EA0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7DF70BE3743248C7ADF861BD551D4ECB" "OwnerKey" = "8:_UNDEFINED" --- 14878,14881 ---- *************** *** 17116,17119 **** --- 17110,17119 ---- "Entry" { + "MsmKey" = "8:_8FB3A8CE02B940CF25472D20E00A9716" + "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_8FBB2340CA8E48DDA2CAD47EEBAFC811" "OwnerKey" = "8:_UNDEFINED" *************** *** 19066,19069 **** --- 19066,19075 ---- "Entry" { + "MsmKey" = "8:_A06387C1F4FA210EC9B0FAEDEA23DCD8" + "OwnerKey" = "8:_80BE7F93190D4B978B038E5F92F19EA0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A06801D223B94AB68D75D3ECB70EE045" "OwnerKey" = "8:_UNDEFINED" *************** *** 19990,19999 **** "Entry" { - "MsmKey" = "8:_A8AA776BF8B4E7E92D540C281A21B0EC" - "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A8AD8DC82E674A4FB3C28087919BD1A6" "OwnerKey" = "8:_UNDEFINED" --- 19996,19999 ---- *************** *** 23968,23971 **** --- 23968,23989 ---- "Entry" { + "MsmKey" = "8:_CB809B6ACC66A69B198A85352A811760" + "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CB809B6ACC66A69B198A85352A811760" + "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_CB809B6ACC66A69B198A85352A811760" + "OwnerKey" = "8:_B7F90BF284454AA883BEB3470E6EAFAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CB8DEAA80ED7430E958540BD928EDC5F" "OwnerKey" = "8:_UNDEFINED" *************** *** 24874,24883 **** "Entry" { - "MsmKey" = "8:_D2B8EFA5017A8756183ACAC48AD532FB" - "OwnerKey" = "8:_80BE7F93190D4B978B038E5F92F19EA0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D2C6DEBA5BAD4D1DBA183897CD98BA2B" "OwnerKey" = "8:_UNDEFINED" --- 24892,24895 ---- *************** *** 28198,28213 **** "Entry" { - "MsmKey" = "8:_ED4E7624401A075C1C74B97A24CE277F" - "OwnerKey" = "8:_091CD427B4EC45C68E4777363A50290A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ED4E7624401A075C1C74B97A24CE277F" - "OwnerKey" = "8:_EE61357707344B65822DB8303CFF2708" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_ED53C00C400147998B11C3FBC656B8B9" "OwnerKey" = "8:_UNDEFINED" --- 28210,28213 ---- *************** *** 46343,46346 **** --- 46343,46366 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26B97EB4BB733733E2F949FB87074991" + { + "SourcePath" = "8:QtOpenGL4.dll" + "TargetName" = "8:QtOpenGL4.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26EA436D08AF477BBDC420D0BF801E2D" { *************** *** 52483,52486 **** --- 52503,52526 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3674668821FFAEEEBD58449CCB8D5A28" + { + "SourcePath" = "8:glew32.dll" + "TargetName" = "8:glew32.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_369950B4E88B4A4686E83EA957EB2E79" { *************** *** 57663,57666 **** --- 57703,57726 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42B4DC5679BA43FA90E57B9F174FCD2B" + { + "SourcePath" = "8:LIBEXPAT.dll" + "TargetName" = "8:LIBEXPAT.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42BAE17565B344D18D25A5E315ABC8B4" { *************** *** 63103,63126 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51F6C6D7D149716E8CCD6DD9EB3A571C" - { - "SourcePath" = "8:QtCore4.dll" - "TargetName" = "8:QtCore4.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51FEF0DD032A47D4B086DF61540B91C4" { --- 63163,63166 ---- *************** *** 64783,64806 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5633B0A50C73B05E02986B83A6FCF541" - { - "SourcePath" = "8:QtGui4.dll" - "TargetName" = "8:QtGui4.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5639F40309794DB081474E080D3F2348" { --- 64823,64826 ---- *************** *** 78623,78626 **** --- 78643,78666 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A9EC1BABDB3397850D9D7E9C31F6D2C" + { + "SourcePath" = "8:QtGui4.dll" + "TargetName" = "8:QtGui4.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7ACBA9C28B9C42A18AFD3F39CF9D3875" { *************** *** 78823,78846 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B39A3675472C7ED0EFBE39B578C6E0F" - { - "SourcePath" = "8:QtOpenGL4.dll" - "TargetName" = "8:QtOpenGL4.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B48E02A52024ADAAC3AE890DCE7D3C6" { --- 78863,78866 ---- *************** *** 79863,79886 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DEA34C77F97C94A9F2A5DDC1ACB17BF" - { - "SourcePath" = "8:LIBEXPAT.dll" - "TargetName" = "8:LIBEXPAT.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DF70BE3743248C7ADF861BD551D4ECB" { --- 79883,79886 ---- *************** *** 87263,87266 **** --- 87263,87286 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8FB3A8CE02B940CF25472D20E00A9716" + { + "SourcePath" = "8:python27.dll" + "TargetName" = "8:python27.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8FBB2340CA8E48DDA2CAD47EEBAFC811" { *************** *** 93683,93686 **** --- 93703,93726 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A06387C1F4FA210EC9B0FAEDEA23DCD8" + { + "SourcePath" = "8:netcdf.dll" + "TargetName" = "8:netcdf.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A06801D223B94AB68D75D3ECB70EE045" { *************** *** 96743,96766 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A8AA776BF8B4E7E92D540C281A21B0EC" - { - "SourcePath" = "8:python27.dll" - "TargetName" = "8:python27.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A8AD8DC82E674A4FB3C28087919BD1A6" { --- 96783,96786 ---- *************** *** 109923,109926 **** --- 109943,109966 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB809B6ACC66A69B198A85352A811760" + { + "SourcePath" = "8:QtCore4.dll" + "TargetName" = "8:QtCore4.dll" + "Tag" = "8:" + "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB8DEAA80ED7430E958540BD928EDC5F" { *************** *** 112943,112966 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D2B8EFA5017A8756183ACAC48AD532FB" - { - "SourcePath" = "8:netcdf.dll" - "TargetName" = "8:netcdf.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D2C6DEBA5BAD4D1DBA183897CD98BA2B" { --- 112983,112986 ---- *************** *** 123523,123546 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED4E7624401A075C1C74B97A24CE277F" - { - "SourcePath" = "8:glew32.dll" - "TargetName" = "8:glew32.dll" - "Tag" = "8:" - "Folder" = "8:_55B311AF5C284D63844345ACDBA28E58" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ED53C00C400147998B11C3FBC656B8B9" { --- 123543,123546 ---- *************** *** 133728,133732 **** "ProductName" = "8:VAPOR" "ProductCode" = "8:{E3E1D6C7-E32A-4495-942F-92C2016A4909}" ! "PackageCode" = "8:{393B4628-2525-4B41-BC6D-0E144CDA7D66}" "UpgradeCode" = "8:{9B2A7A39-8101-4938-811C-8A127325C86F}" "AspNetVersion" = "8:4.0.30319.0" --- 133728,133732 ---- "ProductName" = "8:VAPOR" "ProductCode" = "8:{E3E1D6C7-E32A-4495-942F-92C2016A4909}" ! "PackageCode" = "8:{304306BA-7C18-4FD3-BF66-D2A84EA47A28}" "UpgradeCode" = "8:{9B2A7A39-8101-4938-811C-8A127325C86F}" "AspNetVersion" = "8:4.0.30319.0" |
|
From: Alan N. <ala...@us...> - 2013-05-24 20:43:15
|
Update of /cvsroot/vapor/vapor/make/win32/installx64 In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6834/make/win32/installx64 Modified Files: installVapor64.vbs installx64.vdproj uninstallVapor64.vbs Log Message: windows 64 bit installer changes Index: installVapor64.vbs =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/installVapor64.vbs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installVapor64.vbs 25 Feb 2013 21:40:27 -0000 1.1 --- installVapor64.vbs 24 May 2013 20:43:11 -0000 1.2 *************** *** 17,24 **** vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporshare = vaporhome & "\share" ! vaporbin = vaporhome & "\bin" ! pythonhome = vaporhome & "\lib\python2.7" set shell = CreateObject("wscript.shell") --- 17,24 ---- vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporshare = vaporhome & "share" ! vaporbin = vaporhome & "bin" ! pythonhome = vaporhome & "lib\python2.7" set shell = CreateObject("wscript.shell") Index: installx64.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/installx64.vdproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** installx64.vdproj 22 May 2013 16:40:04 -0000 1.5 --- installx64.vdproj 24 May 2013 20:43:11 -0000 1.6 *************** *** 1738,1741 **** --- 1738,1747 ---- "Entry" { + "MsmKey" = "8:_1D1DF222EE9048FBA11BD220DBBBE1EF" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1D32C16C1D224AEE8981ADC90DF1C2E1" "OwnerKey" = "8:_UNDEFINED" *************** *** 6604,6745 **** "Entry" { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0147C8B653E5457D96D9D0337D30DF62" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_FDA356D9B41F47C2B1C9C8A98F0551FD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E79D40AABBD44DCA9277EC80150D6DA6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E35D24EDF5754A3E9049C5F43603B9EA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_E09396421FEF4ABCB18F6F4D21E31D66" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_D6E7294A50984795A231ED9BDFBB9A16" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_C70709A645C84B96B7373237C41C67A9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_BEFB9652EBE94E7EA14CF8A7982B8030" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_BA218974A26D405B8781E3228BCD4878" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B90087F044BA475C93CFA73F989D1004" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B17F4D39CB3B49858357A54FF24C8126" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_B03034576D3846D083779B6C97F452EB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_A959AF6F77684C23BD4704200EFF7E64" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_A74814D5AF6B438DA3C01EBD55FB14E4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_8E4D2972ACC844138FBEC2FBAFB4A629" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_6F86F3B76DE2499BA72CFCD3F95409CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_548C787106A8467CA5C6A9A61F081C2A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_328FD80F6E564155946A92F6ADAC5FCC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_17FD01BE47A74BC5B6E29EDFF231D207" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0CAB6645FD21421E85C1AB5FBC29BF64" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_0937ACF405824FB6854FBD4A879AFB2F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_03715B5A9B4C48FD8D89B534F67269D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_74378C047AC04B53910A2E832F2F3AD0" - "OwnerKey" = "8:_016286A7A8D946DF8C63A666EE031B4B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7439F2BDFE3F4F2AA6C6D7079F8568C1" "OwnerKey" = "8:_UNDEFINED" --- 6610,6613 ---- *************** *** 9550,9559 **** "Entry" { - "MsmKey" = "8:_A237A1A012124404BC7362EABB3B3EF4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A2735E8A0F0B47C18C28B7F29F4BC664" "OwnerKey" = "8:_UNDEFINED" --- 9418,9421 ---- *************** *** 13312,13315 **** --- 13174,13315 ---- "Entry" { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0147C8B653E5457D96D9D0337D30DF62" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_FDA356D9B41F47C2B1C9C8A98F0551FD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E79D40AABBD44DCA9277EC80150D6DA6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E35D24EDF5754A3E9049C5F43603B9EA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_E09396421FEF4ABCB18F6F4D21E31D66" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_D6E7294A50984795A231ED9BDFBB9A16" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_C70709A645C84B96B7373237C41C67A9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_BEFB9652EBE94E7EA14CF8A7982B8030" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_BA218974A26D405B8781E3228BCD4878" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B90087F044BA475C93CFA73F989D1004" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B17F4D39CB3B49858357A54FF24C8126" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_B03034576D3846D083779B6C97F452EB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_A959AF6F77684C23BD4704200EFF7E64" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_A74814D5AF6B438DA3C01EBD55FB14E4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_8E4D2972ACC844138FBEC2FBAFB4A629" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_6F86F3B76DE2499BA72CFCD3F95409CA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_548C787106A8467CA5C6A9A61F081C2A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_328FD80F6E564155946A92F6ADAC5FCC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_17FD01BE47A74BC5B6E29EDFF231D207" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0CAB6645FD21421E85C1AB5FBC29BF64" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_0937ACF405824FB6854FBD4A879AFB2F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_03715B5A9B4C48FD8D89B534F67269D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_DBD2C17F0059407CB1ED013135FC190E" + "OwnerKey" = "8:_016286A7A8D946DF8C63A666EE031B4B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DBE68E7AF95443A7AD91621159AD0B69" "OwnerKey" = "8:_UNDEFINED" *************** *** 21137,21140 **** --- 21137,21160 ---- "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1D1DF222EE9048FBA11BD220DBBBE1EF" + { + "SourcePath" = "8:..\\..\\..\\scripts\\vdfcp.pl" + "TargetName" = "8:vdfcp.pl" + "Tag" = "8:" + "Folder" = "8:_B4C7BDF9C0004C2E8011C05734A38F12" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1D32C16C1D224AEE8981ADC90DF1C2E1" { *************** *** 46437,46460 **** "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A237A1A012124404BC7362EABB3B3EF4" - { - "SourcePath" = "8:..\\..\\..\\scripts\\vdfcp" - "TargetName" = "8:vdfcp" - "Tag" = "8:" - "Folder" = "8:_B4C7BDF9C0004C2E8011C05734A38F12" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A2735E8A0F0B47C18C28B7F29F4BC664" { --- 46457,46460 ---- *************** *** 67247,67251 **** "ProductName" = "8:VAPOR" "ProductCode" = "8:{39315C4D-F4AA-441E-AE2B-2CC06FEB7F27}" ! "PackageCode" = "8:{4666CC9C-72BE-4835-A265-F66C77924623}" "UpgradeCode" = "8:{90D1C324-DDA2-4EC4-8710-412094C25649}" "AspNetVersion" = "8:4.0.30319.0" --- 67247,67251 ---- "ProductName" = "8:VAPOR" "ProductCode" = "8:{39315C4D-F4AA-441E-AE2B-2CC06FEB7F27}" ! "PackageCode" = "8:{A4938060-8BA3-4233-B7E4-62A6B811E82D}" "UpgradeCode" = "8:{90D1C324-DDA2-4EC4-8710-412094C25649}" "AspNetVersion" = "8:4.0.30319.0" *************** *** 67773,67777 **** "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_74378C047AC04B53910A2E832F2F3AD0" { "UseDynamicProperties" = "11:TRUE" --- 67773,67777 ---- "MergeModule" { ! "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DBD2C17F0059407CB1ED013135FC190E" { "UseDynamicProperties" = "11:TRUE" Index: uninstallVapor64.vbs =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installx64/uninstallVapor64.vbs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** uninstallVapor64.vbs 25 Feb 2013 21:40:28 -0000 1.1 --- uninstallVapor64.vbs 24 May 2013 20:43:12 -0000 1.2 *************** *** 14,21 **** vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporbin = vaporhome & "\bin;" ! vaporshare = vaporhome & "\share" ! vaporidl = vaporhome & "\bin" ! vaporidl2 = vaporhome & "\bin;" vaporpythonhome = vaporhome & "\lib\python2.6" --- 14,21 ---- vaporhome = Right(inputstring, len(inputstring) - posn -1) ! vaporbin = vaporhome & "bin;" ! vaporshare = vaporhome & "share" ! vaporidl = vaporhome & "bin" ! vaporidl2 = vaporhome & "bin;" vaporpythonhome = vaporhome & "\lib\python2.6" *************** *** 39,43 **** end if ! ' Find VAPOR_HOME\bin; in the path pathvar = sysEnv("path") posn = inStr(pathvar,vaporbin) --- 39,43 ---- end if ! ' Find VAPOR_HOME\bin in the path pathvar = sysEnv("path") posn = inStr(pathvar,vaporbin) *************** *** 64,70 **** Else posn = inStr(idlpath, vaporidl) ! if posn = 0 Then ! MsgBox("Unable to remove VAPOR from IDL_DLM_PATH") ! Else idlpath = Replace(idlpath, vaporidl, "") if idlpath = "" Then --- 64,68 ---- Else posn = inStr(idlpath, vaporidl) ! if posn <> 0 Then idlpath = Replace(idlpath, vaporidl, "") if idlpath = "" Then |
|
From: clynejp <cl...@us...> - 2013-05-24 19:36:51
|
Update of /cvsroot/vapor/vapor/apps/ncdf2vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3766 Modified Files: ncdf2vdf.cpp Log Message: Accidentally deleted diagnostic message Index: ncdf2vdf.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/ncdf2vdf/ncdf2vdf.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ncdf2vdf.cpp 14 May 2013 15:13:12 -0000 1.27 --- ncdf2vdf.cpp 24 May 2013 19:36:49 -0000 1.28 *************** *** 494,497 **** --- 494,498 ---- for (itr = timemap.begin(); itr != timemap.end(); ++itr) { if (! opt.quiet) { + cout << "Processing VDC time step " << itr->first << endl; } for (int v = 0; v < variables.size(); v++) { |
|
From: clynejp <cl...@us...> - 2013-05-24 18:44:00
|
Update of /cvsroot/vapor/vapor/lib/vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1265 Modified Files: DataMgr.cpp Log Message: Partial fix for 3613750 - error messages when you first enable a 2d wrf visualizatino This is a workaround that will silence the messages, but not fix the problem Index: DataMgr.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/lib/vdf/DataMgr.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** DataMgr.cpp 13 May 2013 20:34:27 -0000 1.107 --- DataMgr.cpp 24 May 2013 18:43:58 -0000 1.108 *************** *** 1589,1593 **** timestep,"", reflevel, 0, min, max, false ); ! EnableErrMsg(enable); if (! rg) return; --- 1589,1593 ---- timestep,"", reflevel, 0, min, max, false ); ! EnableErrMsg(enable); SetErrCode(0); if (! rg) return; *************** *** 1619,1623 **** timestep,"", reflevel, 0, min, max, false ); ! EnableErrMsg(enable); if (! rg) return; --- 1619,1623 ---- timestep,"", reflevel, 0, min, max, false ); ! EnableErrMsg(enable); SetErrCode(0); if (! rg) return; *************** *** 1642,1646 **** bool enable = EnableErrMsg(false); RegularGrid *rg = GetGrid(ts,"", reflevel, 0, min, max, false); ! EnableErrMsg(enable); if (! rg) return; --- 1642,1646 ---- bool enable = EnableErrMsg(false); RegularGrid *rg = GetGrid(ts,"", reflevel, 0, min, max, false); ! EnableErrMsg(enable); SetErrCode(0); if (! rg) return; |
|
From: Alan N. <ala...@us...> - 2013-05-24 18:10:25
|
Update of /cvsroot/vapor/vapor/apps/vaporgui/misc In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31759/vaporgui/misc Modified Files: vizfeatureparams.cpp Log Message: Fix for 3613851. Also fixed problem with Barbs not enabled on 2D data sets. Index: vizfeatureparams.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/misc/vizfeatureparams.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** vizfeatureparams.cpp 13 Jan 2013 23:28:26 -0000 1.53 --- vizfeatureparams.cpp 24 May 2013 18:10:22 -0000 1.54 *************** *** 118,122 **** //Determine current combo entry int vizNum = VizWinMgr::getInstance()->getActiveViz(); ! if (vizNum < 0 || DataStatus::getInstance()->getNumSessionVariables() <=0){ QMessageBox::warning(vizFeatureDlg,"No visualizers or variables", QString("No visualizers or variables exist to be modified"), --- 118,124 ---- //Determine current combo entry int vizNum = VizWinMgr::getInstance()->getActiveViz(); ! if (vizNum < 0 || ! (!DataStatus::getInstance()->dataIsPresent3D() && ! !DataStatus::getInstance()->dataIsPresent2D())){ QMessageBox::warning(vizFeatureDlg,"No visualizers or variables", QString("No visualizers or variables exist to be modified"), |
|
From: Alan N. <ala...@us...> - 2013-05-24 18:10:24
|
Update of /cvsroot/vapor/vapor/apps/vaporgui/guis In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31759/vaporgui/guis Modified Files: arroweventrouter.cpp Log Message: Fix for 3613851. Also fixed problem with Barbs not enabled on 2D data sets. Index: arroweventrouter.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/vaporgui/guis/arroweventrouter.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** arroweventrouter.cpp 25 Jan 2013 23:35:37 -0000 1.24 --- arroweventrouter.cpp 24 May 2013 18:10:22 -0000 1.25 *************** *** 662,666 **** DataStatus* ds = DataStatus::getInstance(); ! if (ds->dataIsPresent3D()) { setEnabled(true); instanceTable->setEnabled(true); --- 662,666 ---- DataStatus* ds = DataStatus::getInstance(); ! if (ds->dataIsPresent3D()||ds->dataIsPresent2D()) { setEnabled(true); instanceTable->setEnabled(true); |
|
From: clynejp <cl...@us...> - 2013-05-23 23:22:34
|
Update of /cvsroot/vapor/vapor/lib/vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11947 Modified Files: DCReaderMOM.cpp DCReaderROMS.cpp WeightTable.cpp Log Message: Various tweaks needed to get resampling working with all test data sets Index: WeightTable.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/lib/vdf/WeightTable.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** WeightTable.cpp 21 May 2013 12:46:02 -0000 1.14 --- WeightTable.cpp 23 May 2013 23:22:31 -0000 1.15 *************** *** 488,491 **** --- 488,494 ---- lonMax = (int)((maxlon -_lonLatExtents[0])/_deltaLon); } + if (lonMin < 0) { + lonMin = 0; + } //cover the edges too! Index: DCReaderROMS.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/lib/vdf/DCReaderROMS.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DCReaderROMS.cpp 20 May 2013 22:24:59 -0000 1.5 --- DCReaderROMS.cpp 23 May 2013 23:22:31 -0000 1.6 *************** *** 791,823 **** // ! // Get lat extents. Check boundary only // llb._latexts[0] = llb._latexts[1] = llb._latbuf[0]; ! int j = 0; for (int i=0; i<llb._nx; i++) { ! llb._latexts[1] = llb._latbuf[j*llb._nx+i]>llb._latexts[1] ? llb._latbuf[j*llb._nx+i] : llb._latexts[1]; ! llb._latexts[0] = llb._latbuf[j*llb._nx+i]<llb._latexts[0] ? llb._latbuf[j*llb._nx+i] : llb._latexts[0]; } ! j = llb._ny-1; ! for (int i=0; i<llb._nx; i++) { ! llb._latexts[1] = llb._latbuf[j*llb._nx+i]>llb._latexts[1] ? llb._latbuf[j*llb._nx+i] : llb._latexts[1]; ! llb._latexts[0] = llb._latbuf[j*llb._nx+i]<llb._latexts[0] ? llb._latbuf[j*llb._nx+i] : llb._latexts[0]; } // ! // Get lon extents. Check boundary only // llb._lonexts[0] = llb._lonexts[1] = llb._lonbuf[0]; - int i = 0; for (int j=0; j<llb._ny; j++) { ! llb._lonexts[1] = llb._lonbuf[j*llb._nx+i]>llb._lonexts[1] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[1]; ! llb._lonexts[0] = llb._lonbuf[j*llb._nx+i]<llb._lonexts[0] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[0]; } ! i = llb._nx-1; ! for (int j=0; j<llb._ny; j++) { ! llb._lonexts[1] = llb._lonbuf[j*llb._nx+i]>llb._lonexts[1] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[1]; ! llb._lonexts[0] = llb._lonbuf[j*llb._nx+i]<llb._lonexts[0] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[0]; } return(0); --- 791,847 ---- // ! // Get lat extents. Really only need to check data on boundary, ! // but we're lazy. N.B. doesn't handle case where data cross either pole. ! // // llb._latexts[0] = llb._latexts[1] = llb._latbuf[0]; ! for (int j=0; j<llb._ny; j++) { for (int i=0; i<llb._nx; i++) { ! float tmp = llb._latbuf[j*llb._nx+i]; ! llb._latexts[0] = tmp < llb._latexts[0] ? tmp : llb._latexts[0]; ! llb._latexts[1] = tmp > llb._latexts[1] ? tmp : llb._latexts[1]; ! } } ! ! // ! // Now deal with longitude, which may wrap (i.e. the values may ! // not be monotonicly increasing along a scan line. First we ! // handle wraparound. We simply look for a big jump between adjacent ! // points. N.B. testing for changes from increasing to decreasing (or ! // vise versa don't work for data sets that are extremely distored). ! // ! for (int j=0; j<llb._ny; j++) { ! for (int i=0; i<llb._nx-1; i++) { ! float delta = 180.0; ! if (fabs(llb._lonbuf[j*llb._nx+i] - llb._lonbuf[j*llb._nx+i+1])>delta) { ! llb._lonbuf[j*llb._nx+i+1] += 360.0; ! } ! } } // ! // Now get lon extents. // llb._lonexts[0] = llb._lonexts[1] = llb._lonbuf[0]; for (int j=0; j<llb._ny; j++) { ! for (int i=0; i<llb._nx; i++) { ! float tmp = llb._lonbuf[j*llb._nx+i]; ! llb._lonexts[0] = tmp < llb._lonexts[0] ? tmp : llb._lonexts[0]; ! llb._lonexts[1] = tmp > llb._lonexts[1] ? tmp : llb._lonexts[1]; ! } } ! // ! // Finally, try to bring everything back to -360 to 360 ! // ! if (llb._lonexts[0] > 180 || llb._lonexts[1] > 360.0) { ! for (int j=0; j<llb._ny; j++) { ! for (int i=0; i<llb._nx; i++) { ! llb._lonbuf[j*llb._nx+i] -= 360.0; ! } ! } ! llb._lonexts[0] -= 360.0; ! llb._lonexts[1] -= 360.0; } return(0); Index: DCReaderMOM.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/lib/vdf/DCReaderMOM.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DCReaderMOM.cpp 20 May 2013 22:24:59 -0000 1.6 --- DCReaderMOM.cpp 23 May 2013 23:22:31 -0000 1.7 *************** *** 797,831 **** // ! // Get lat extents. Check boundary only // llb._latexts[0] = llb._latexts[1] = llb._latbuf[0]; ! int j = 0; for (int i=0; i<llb._nx; i++) { ! llb._latexts[1] = llb._latbuf[j*llb._nx+i]>llb._latexts[1] ? llb._latbuf[j*llb._nx+i] : llb._latexts[1]; ! llb._latexts[0] = llb._latbuf[j*llb._nx+i]<llb._latexts[0] ? llb._latbuf[j*llb._nx+i] : llb._latexts[0]; } - - j = llb._ny-1; - for (int i=0; i<llb._nx; i++) { - llb._latexts[1] = llb._latbuf[j*llb._nx+i]>llb._latexts[1] ? llb._latbuf[j*llb._nx+i] : llb._latexts[1]; - llb._latexts[0] = llb._latbuf[j*llb._nx+i]<llb._latexts[0] ? llb._latbuf[j*llb._nx+i] : llb._latexts[0]; } // ! // Get lon extents. Check boundary only // - llb._lonexts[0] = llb._lonexts[1] = llb._lonbuf[0]; - int i = 0; for (int j=0; j<llb._ny; j++) { ! llb._lonexts[1] = llb._lonbuf[j*llb._nx+i]>llb._lonexts[1] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[1]; ! llb._lonexts[0] = llb._lonbuf[j*llb._nx+i]<llb._lonexts[0] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[0]; } ! i = llb._nx-1; for (int j=0; j<llb._ny; j++) { ! llb._lonexts[1] = llb._lonbuf[j*llb._nx+i]>llb._lonexts[1] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[1]; ! llb._lonexts[0] = llb._lonbuf[j*llb._nx+i]<llb._lonexts[0] ? llb._lonbuf[j*llb._nx+i] : llb._lonexts[0]; } return(0); } --- 797,863 ---- // ! // Get lat extents. Really only need to check data on boundary, ! // but we're lazy. N.B. doesn't handle case where data cross either pole. ! // // llb._latexts[0] = llb._latexts[1] = llb._latbuf[0]; ! for (int j=0; j<llb._ny; j++) { for (int i=0; i<llb._nx; i++) { ! float tmp = llb._latbuf[j*llb._nx+i]; ! llb._latexts[0] = tmp < llb._latexts[0] ? tmp : llb._latexts[0]; ! llb._latexts[1] = tmp > llb._latexts[1] ? tmp : llb._latexts[1]; } } + // ! // Now deal with longitude, which may wrap (i.e. the values may ! // not be monotonicly increasing along a scan line. First we ! // handle wraparound. We simply look for a big jump between adjacent ! // points. N.B. testing for changes from increasing to decreasing (or ! // vise versa don't work for data sets that are extremely distored). // for (int j=0; j<llb._ny; j++) { ! for (int i=0; i<llb._nx-1; i++) { ! float delta = 180.0; ! if (fabs(llb._lonbuf[j*llb._nx+i] - llb._lonbuf[j*llb._nx+i+1])>delta) { ! llb._lonbuf[j*llb._nx+i+1] += 360.0; ! } ! } } ! // ! // Now get lon extents. ! // ! llb._lonexts[0] = llb._lonexts[1] = llb._lonbuf[0]; for (int j=0; j<llb._ny; j++) { ! for (int i=0; i<llb._nx; i++) { ! // ! // Ugh. Don't look at longitudes near poles 'cause things ! // get squirely there ! // ! if (llb._latbuf[j*llb._nx+i] > -60.0 && llb._latbuf[j*llb._nx+i] < 60.0){ ! float tmp = llb._lonbuf[j*llb._nx+i]; ! llb._lonexts[0] = tmp < llb._lonexts[0] ? tmp : llb._lonexts[0]; ! llb._lonexts[1] = tmp > llb._lonexts[1] ? tmp : llb._lonexts[1]; ! } ! } } + // + // Finally, try to bring everything back to -360 to 360 + // + if (llb._lonexts[0] > 180 || llb._lonexts[1] > 360.0) { + for (int j=0; j<llb._ny; j++) { + for (int i=0; i<llb._nx; i++) { + llb._lonbuf[j*llb._nx+i] -= 360.0; + } + } + llb._lonexts[0] -= 360.0; + llb._lonexts[1] -= 360.0; + } + if ((llb._lonexts[1] - llb._lonexts[0]) > 360.0) { + llb._lonexts[1] = llb._lonexts[0] + 360.0; + } return(0); } |
|
From: clynejp <cl...@us...> - 2013-05-22 22:41:19
|
Update of /cvsroot/vapor/vapor/apps/mom2vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5043 Modified Files: Makefile Log Message: Fixed library dependency Index: Makefile =================================================================== RCS file: /cvsroot/vapor/vapor/apps/mom2vdf/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 8 May 2013 03:16:42 -0000 1.3 --- Makefile 22 May 2013 22:41:17 -0000 1.4 *************** *** 9,13 **** #LIB_DEFS = vdf.def ! LIBRARIES = proj vdf common $(NETCDF_LIBS) udunits2 expat include ${TOP}/make/config/base.mk --- 9,13 ---- #LIB_DEFS = vdf.def ! LIBRARIES = vdf common proj $(NETCDF_LIBS) udunits2 expat include ${TOP}/make/config/base.mk |
|
From: Miles R-L <mi...@us...> - 2013-05-22 21:24:27
|
Update of /cvsroot/vapor/vapor/share/doc/man In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29453 Modified Files: Makefile Added Files: vdfcp.pl.pod Removed Files: vdfcp.pod Log Message: renamed man page for vdfcp.pl, fixed reference in makefile. --- NEW FILE: vdfcp.pl.pod --- =begin comment $Id: vdfcp.pl.pod,v 1.1 2013/05/22 21:24:24 milesrl Exp $ =end comment =head1 NAME vdfcp.pl - Copy a vdf dataset, either partially or entirely =head1 SYNOPSIS B<vdfcp.pl> [options] I<srcvdf> I<destination> B<vdfcp.pl> -list I<srcvdf> B<vdfcp.pl> -info I<srcvdf> =head1 DESCRIPTION B<vdfcp.pl> copies I<srcvdf>, or part of I<srcvdf>, to I<destination>. The first form does this. The second form is used to obtain a list of the files that would be copied if the first form were used on I<srcvdf>. The third form prints a human-readable message detailing the available ranges of timesteps, variables and refinement available in I<srcvdf>. =head1 OPTIONS =over 4 =item -list Tells vdfcp.pl to list the items it would copy, instead of actually copying them. This list includes the .vdf metafile itself, and is delimited by newlines. No destination is needed when -info is given, as nothing will be copied. =item -info Tells vdfcp.pl to display available variables, timesteps and levels in a human-readable format. If given with arguments like ts0, ts1, numts, level, vars and nvars, the report will be limited to the selected ranges. This will also tell you if parts of your selection are not available in the dataset. No destination is needed when -info is given, as nothing will be copied. Overrides -list. =item -vars E<lt>v1:v2:v3:...E<gt> A colon-delimited list of names of variables. These variables will be included in any listing or copying done by vdfcp.pl at runtime. =item -nvars E<lt>v1:v2:v3:...E<gt> A colon-delimited list of names of variables. These variables will NOT be included in any listing or copying done by vdfcp.pl at runtime. Overrides -vars. =item -ts0 E<lt>#E<gt> The number of the first timestep to copy or scan from the source dataset. This option has the highest priority of any timestep-related options. =item -ts1 E<lt>#E<gt> The number of the last timestep to copy or scan from the source dataset. =item -numts E<lt>#E<gt> The number of timesteps to copy or scan from the source dataset. This option has the lowest priority of any timestep-related options. =item -level E<lt>#E<gt> The highest level of refinement to scan or copy from the source dataset. All levels below this will be copied as well. =item -f Tells vdfcp.pl to overwrite any existing dataset at the specified destination. If vdfcp.pl is overwriting an existing dataset, it will print warnings. =item -v Prints information while copying, including a confirmation of the source and destination .vdf metafiles, and the variables being copied. =item -help Print a usage statement and then exit. =back =head1 EXAMPLES The command... C<vdfcp.pl -vars P:T -level 2 -ts0 10 -numts 20 path/to/source.vdf path/to/data> ...will copy source.vdf and its associated dataset to the path/to/data directory, which must exist prior to the execution of the command. If instead of typing "path/to/data", the user had typed "path/to/data.vdf", data.vdf would become the metafile for the new dataset, and data_data would be placed in the same directory. Only the variables P and T will be copied, only levels 0, 1 and 2, and timesteps 10 through 29 will be copied to the new dataset. This command... C<tar -cf foo.tar `vdfcp.pl -list -ts1 50 -numts 20 path/to/source.vdf`> ...will cause tar to archive all files required to represent timesteps 31 to 50 of source.vdf's associated dataset in foo.tar. Note that when ts1 is used with numts, the range of copied timesteps ends at ts1. However, if ts0 were also specified, it would take priority and the range would begin at ts0. If only numts is given, then the range will begin at the first timestep of the dataset. This command... C<vdfcp.pl -info -nvars bx:bz ts1 30 path/to/source.vdf> ...will show the range of levels in source.vdf's dataset, as well as all timesteps below 30. It will also list all variables except for bx and bz. If the dataset has no timesteps at or above 30, vdfcp.pl will print an error message and exit. =head1 SEE ALSO vdfcreate, wrf2vdf, I<Copy a VDC to a new location> =head1 HISTORY Last updated on $Date: 2013/05/22 21:24:24 $ Index: Makefile =================================================================== RCS file: /cvsroot/vapor/vapor/share/doc/man/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 20 May 2013 22:55:31 -0000 1.12 --- Makefile 22 May 2013 21:24:24 -0000 1.13 *************** *** 9,13 **** wrfvdfcreate wrf2vdf ncdfvdfcreate ncdf2vdf flashvdfcreate \ flashamr2vdf tiff2geotiff getWMSImage \ ! momvdfcreate mom2vdf romsvdfcreate roms2vdf vdfcp --- 9,13 ---- wrfvdfcreate wrf2vdf ncdfvdfcreate ncdf2vdf flashvdfcreate \ flashamr2vdf tiff2geotiff getWMSImage \ ! momvdfcreate mom2vdf romsvdfcreate roms2vdf vdfcp.pl --- vdfcp.pod DELETED --- |
|
From: Miles R-L <mi...@us...> - 2013-05-22 20:59:05
|
Update of /cvsroot/vapor/vapor/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28483 Modified Files: vdfcp.pl Log Message: Replaced references to vdfcp with vdfcp.pl in vdfcp's help string. Index: vdfcp.pl =================================================================== RCS file: /cvsroot/vapor/vapor/scripts/vdfcp.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vdfcp.pl 22 May 2013 17:39:51 -0000 1.1 --- vdfcp.pl 22 May 2013 20:59:03 -0000 1.2 *************** *** 11,15 **** ######################################################################### # ! # File: vdfbkup.pl # # Author: Miles Rufat-Latre --- 11,15 ---- ######################################################################### # ! # File: vdfcp.pl # # Author: Miles Rufat-Latre *************** *** 41,45 **** #BEGIN GLOBAL VARIABLE DECLARATIONS my $usage = ! "Usage: vdfcp [options] source.vdf <dest>\n" . "OPTIONS...\n" . "-ts0 #\n" . --- 41,45 ---- #BEGIN GLOBAL VARIABLE DECLARATIONS my $usage = ! "Usage: vdfcp.pl [options] source.vdf <dest>\n" . "OPTIONS...\n" . "-ts0 #\n" . |
|
From: Miles R-L <mi...@us...> - 2013-05-22 20:57:45
|
Update of /cvsroot/vapor/vapor/share/doc/man In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28436 Modified Files: vdfcp.pod Log Message: Replaced all references to vdfcp in documentation with vdfcp.pl Index: vdfcp.pod =================================================================== RCS file: /cvsroot/vapor/vapor/share/doc/man/vdfcp.pod,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vdfcp.pod 20 May 2013 22:55:31 -0000 1.2 --- vdfcp.pod 22 May 2013 20:57:43 -0000 1.3 *************** *** 7,21 **** =head1 NAME ! vdfcp - Copy a vdf dataset, either partially or entirely =head1 SYNOPSIS ! B<vdfcp> [options] I<srcvdf> I<destination> ! B<vdfcp> -list I<srcvdf> ! B<vdfcp> -info I<srcvdf> =head1 DESCRIPTION ! B<vdfcp> copies I<srcvdf>, or part of I<srcvdf>, to I<destination>. The first form does this. The second form is used to obtain a list of the files that would be copied if the first form were used on I<srcvdf>. The third form prints --- 7,21 ---- =head1 NAME ! vdfcp.pl - Copy a vdf dataset, either partially or entirely =head1 SYNOPSIS ! B<vdfcp.pl> [options] I<srcvdf> I<destination> ! B<vdfcp.pl> -list I<srcvdf> ! B<vdfcp.pl> -info I<srcvdf> =head1 DESCRIPTION ! B<vdfcp.pl> copies I<srcvdf>, or part of I<srcvdf>, to I<destination>. The first form does this. The second form is used to obtain a list of the files that would be copied if the first form were used on I<srcvdf>. The third form prints *************** *** 29,33 **** =item -list ! Tells vdfcp to list the items it would copy, instead of actually copying them. This list includes the .vdf metafile itself, and is delimited by newlines. No destination is needed when -info is given, as nothing will be copied. --- 29,33 ---- =item -list ! Tells vdfcp.pl to list the items it would copy, instead of actually copying them. This list includes the .vdf metafile itself, and is delimited by newlines. No destination is needed when -info is given, as nothing will be copied. *************** *** 35,39 **** =item -info ! Tells vdfcp to display available variables, timesteps and levels in a human-readable format. If given with arguments like ts0, ts1, numts, level, vars and nvars, the report will be limited to the selected ranges. This will --- 35,39 ---- =item -info ! Tells vdfcp.pl to display available variables, timesteps and levels in a human-readable format. If given with arguments like ts0, ts1, numts, level, vars and nvars, the report will be limited to the selected ranges. This will *************** *** 45,54 **** A colon-delimited list of names of variables. These variables will be included ! in any listing or copying done by vdfcp at runtime. =item -nvars E<lt>v1:v2:v3:...E<gt> A colon-delimited list of names of variables. These variables will NOT be ! included in any listing or copying done by vdfcp at runtime. Overrides -vars. =item -ts0 E<lt>#E<gt> --- 45,54 ---- A colon-delimited list of names of variables. These variables will be included ! in any listing or copying done by vdfcp.pl at runtime. =item -nvars E<lt>v1:v2:v3:...E<gt> A colon-delimited list of names of variables. These variables will NOT be ! included in any listing or copying done by vdfcp.pl at runtime. Overrides -vars. =item -ts0 E<lt>#E<gt> *************** *** 73,78 **** =item -f ! Tells vdfcp to overwrite any existing dataset at the specified destination. If ! vdfcp is overwriting an existing dataset, it will print warnings. =item -v --- 73,78 ---- =item -f ! Tells vdfcp.pl to overwrite any existing dataset at the specified destination. If ! vdfcp.pl is overwriting an existing dataset, it will print warnings. =item -v *************** *** 92,96 **** The command... ! C<vdfcp -vars P:T -level 2 -ts0 10 -numts 20 path/to/source.vdf path/to/data> ...will copy source.vdf and its associated dataset to the path/to/data directory, --- 92,96 ---- The command... ! C<vdfcp.pl -vars P:T -level 2 -ts0 10 -numts 20 path/to/source.vdf path/to/data> ...will copy source.vdf and its associated dataset to the path/to/data directory, *************** *** 104,108 **** This command... ! C<tar -cf foo.tar `vdfcp -list -ts1 50 -numts 20 path/to/source.vdf`> ...will cause tar to archive all files required to represent timesteps 31 to 50 of --- 104,108 ---- This command... ! C<tar -cf foo.tar `vdfcp.pl -list -ts1 50 -numts 20 path/to/source.vdf`> ...will cause tar to archive all files required to represent timesteps 31 to 50 of *************** *** 115,123 **** This command... ! C<vdfcp -info -nvars bx:bz ts1 30 path/to/source.vdf> ...will show the range of levels in source.vdf's dataset, as well as all timesteps below 30. It will also list all variables except for bx and bz. If the dataset has ! no timesteps at or above 30, vdfcp will print an error message and exit. =head1 SEE ALSO --- 115,123 ---- This command... ! C<vdfcp.pl -info -nvars bx:bz ts1 30 path/to/source.vdf> ...will show the range of levels in source.vdf's dataset, as well as all timesteps below 30. It will also list all variables except for bx and bz. If the dataset has ! no timesteps at or above 30, vdfcp.pl will print an error message and exit. =head1 SEE ALSO |
|
From: clynejp <cl...@us...> - 2013-05-22 20:38:03
|
Update of /cvsroot/vapor/vapor/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26148 Modified Files: Makefile Log Message: vdfcp renamed to vdfcp.pl Index: Makefile =================================================================== RCS file: /cvsroot/vapor/vapor/scripts/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 20 May 2013 22:55:31 -0000 1.14 --- Makefile 22 May 2013 20:38:01 -0000 1.15 *************** *** 25,29 **** @$(INSTALL_EXEC) vdfbkup.pl $(INSTALL_BINDIR) @$(INSTALL_EXEC) getWMSImage.sh $(INSTALL_BINDIR) ! @$(INSTALL_EXEC) vdfcp $(INSTALL_BINDIR) $(BINDIR)/vapor-setup.csh: FRC --- 25,29 ---- @$(INSTALL_EXEC) vdfbkup.pl $(INSTALL_BINDIR) @$(INSTALL_EXEC) getWMSImage.sh $(INSTALL_BINDIR) ! @$(INSTALL_EXEC) vdfcp.pl $(INSTALL_BINDIR) $(BINDIR)/vapor-setup.csh: FRC |
|
From: Alan N. <ala...@us...> - 2013-05-22 17:52:10
|
Update of /cvsroot/vapor/vapor/make/win32/installer In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18384/make/win32/installer Modified Files: installer.vdproj Log Message: Another 32-bit installer fix Index: installer.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installer/installer.vdproj,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** installer.vdproj 22 May 2013 17:50:34 -0000 1.68 --- installer.vdproj 22 May 2013 17:52:08 -0000 1.69 *************** *** 133728,133732 **** "ProductName" = "8:VAPOR" "ProductCode" = "8:{E3E1D6C7-E32A-4495-942F-92C2016A4909}" ! "PackageCode" = "8:{895B2F66-A1C2-4E95-80CE-4FEE9538860C}" "UpgradeCode" = "8:{9B2A7A39-8101-4938-811C-8A127325C86F}" "AspNetVersion" = "8:4.0.30319.0" --- 133728,133732 ---- "ProductName" = "8:VAPOR" "ProductCode" = "8:{E3E1D6C7-E32A-4495-942F-92C2016A4909}" ! "PackageCode" = "8:{393B4628-2525-4B41-BC6D-0E144CDA7D66}" "UpgradeCode" = "8:{9B2A7A39-8101-4938-811C-8A127325C86F}" "AspNetVersion" = "8:4.0.30319.0" |
|
From: Alan N. <ala...@us...> - 2013-05-22 17:50:38
|
Update of /cvsroot/vapor/vapor/make/win32/installer In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18298/make/win32/installer Modified Files: installer.vdproj Log Message: Windows 32-bit installer changes Index: installer.vdproj =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/installer/installer.vdproj,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** installer.vdproj 8 May 2013 17:00:49 -0000 1.67 --- installer.vdproj 22 May 2013 17:50:34 -0000 1.68 *************** *** 526,535 **** "Entry" { - "MsmKey" = "8:_047BF447824B48B0A30E68D01CD9B7B4" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_048067DFAB704C1088E9F0424387FD1E" "OwnerKey" = "8:_UNDEFINED" [...1836 lines suppressed...] "Tag" = "8:" --- 134889,134893 ---- "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FD79FB204A4D425DB86D5DE0665314E6" { ! "SourcePath" = "8:..\\..\\..\\targets\\win32\\bin\\momvdfcreate.exe" "TargetName" = "8:" "Tag" = "8:" *************** *** 135271,135275 **** "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FE1993DC00E74DC2B94A77BA51940811" { ! "SourcePath" = "8:..\\..\\..\\targets\\win64\\bin\\common.dll" "TargetName" = "8:" "Tag" = "8:" --- 134917,134921 ---- "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FE1993DC00E74DC2B94A77BA51940811" { ! "SourcePath" = "8:..\\..\\..\\targets\\win32\\bin\\common.dll" "TargetName" = "8:" "Tag" = "8:" |
|
From: Alan N. <ala...@us...> - 2013-05-22 17:50:36
|
Update of /cvsroot/vapor/vapor/make/win32/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18298/make/win32/common Modified Files: common.sln Log Message: Windows 32-bit installer changes Index: common.sln =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/common/common.sln,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** common.sln 22 May 2013 16:40:04 -0000 1.44 --- common.sln 22 May 2013 17:50:34 -0000 1.45 *************** *** 116,119 **** --- 116,120 ---- {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Debug|x64.ActiveCfg = Debug|x64 {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|Win32.ActiveCfg = Release|Win32 + {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|Win32.Build.0 = Release|Win32 {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|x64.ActiveCfg = Release|x64 {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|x64.Build.0 = Release|x64 |
|
From: Miles R-L <mi...@us...> - 2013-05-22 17:39:53
|
Update of /cvsroot/vapor/vapor/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17896 Added Files: vdfcp.pl Removed Files: vdfcp Log Message: Renamed vdfcp to vdfcp.pl --- vdfcp DELETED --- --- NEW FILE: vdfcp.pl --- #!/usr/bin/perl # # $Id: vdfcp.pl,v 1.1 2013/05/22 17:39:51 milesrl Exp $ # ######################################################################### # # # Copyright (C) 2013 # # University Corporation for Atmospheric Research # # All Rights Reserved # # # ######################################################################### # # File: vdfbkup.pl # # Author: Miles Rufat-Latre # National Center for Atmospheric Research # PO 3000, Boulder, Colorado # # Date: Fri Mar 13 18:00:32 MST 2013 # # Description: A command-line utility for copying .vdf datasets # # Usage: # # Environment: # # Files: # # # Options: use strict; #some warnings are expected in normal execution #use warnings; use File::Copy; use File::Path; use Scalar::Util; no warnings "uninitialized"; ########################################## #BEGIN GLOBAL VARIABLE DECLARATIONS my $usage = "Usage: vdfcp [options] source.vdf <dest>\n" . "OPTIONS...\n" . "-ts0 #\n" . " Set '#' as first timestep to copy.\n" . "-ts1 #\n" . " Set '#' as last timestep to copy.\n" . "-numts #\n" . " Copy '#' timesteps.\n" . "-vars a:b:c\n" . " Copy only variables 'a', 'b' and 'c'.\n" . "-nvars a:b:c\n" . " Copy all variables EXCEPT 'a', 'b' and 'c'.\n" . "-level #\n" . " Copy all levels of detail up to and including '#'.\n" . "-info\n" . " Show available levels, frames and variables in a human-readable format.\n Can also be used to show selected ranges. No target needed.\n" . "-list\n" . " Output a list of all files (each with its full path)\n that would be copied given the selected ranges.\n" . "-help\n" . " Print this usage statement and exit.\n" . "-v\n" . " verbose: output detailed information when copying.\n" . "-f\n" . " force: overwrite existing datasets, create destination directory.\n"; #user input variables my $mints = -1; #these four start at -1 so we know if there was user input my $maxts = -1; my $numts = -1; my $level = -1; my $info = 0; my $list = 0; #instead of copying, list the files that would be copied my $force = 0; #overwrite target files if they exist my $verbose = 0; #print extra information #variables used to store information about the ranges in a dataset my $amints; my $amaxts; my $alevel; #variables wanted/not wanted my @vars; my @include; my @exclude; my %inc; #mapped versions of the arrays above my %exc; #a list of those files which are actually available my @varfiles; #information about the source and target datasets my $srcvdf; my $srcdir; my $dstvdf; my $dstdir; #utility variables my @argbuf; my $arg; my @tok; #END VARIABLE DECLARATIONS ########################################## ########################################## #BEGIN EXECUTED CODE #the following function calls fill out the variables above parseOptions(); #get any options the user input parseArgs(); #get the source and destination print "SOURCE=$srcvdf\nTARGET=$dstvdf\n" if($verbose); #get all the variables we'll be handling @vars = grep{-d "$srcdir/$_" && ($_ eq "mask" || (keys(%inc) == 0 || $inc{$_})) && !$exc{$_}} dirContents($srcdir); #scanvars prints scanned information and exits if in info mode scanvars(); #handle force cases if(-d $dstdir && !$list) { unless($force) { print "cannot copy over existing target directory\n use '-f' option to force overwrite\n"; exit(0); } print "WARNING: overwriting existing target directory!\n"; rmtree($dstdir); } if(-f $dstvdf && $list == 0) { unless($force) { print "cannot copy over existing target .vdf metafile\n use '-f' option to force overwrite\n"; exit(0); } print "WARNING: overwriting existing target .vdf metafile!\n"; unlink($dstvdf); } #copy the files (or just print them if user said "list") print "making target directory: $dstdir\n" if($verbose); mkdir($dstdir); if($list) { print "$srcvdf\n"; } else { print "copying metafile \"$srcvdf\"...\n" if($verbose); File::Copy::copy($srcvdf, $dstvdf) or die "failed to copy source metafile to target location: $!\n"; } my $var; my $buf0; my $buf1; foreach(@vars) { print "copying variable \"$_\"...\n" if($verbose && !$list); $var = $_; @varfiles = grep{-f "$srcdir/$var/$_"} dirContents("$srcdir/$var"); mkdir("$dstdir/$var"); foreach(@varfiles) { @tok = split(/\./, $_); #note that we check for '-1' value in some parameters if ( #exploded the condition for easier reading ( substr($tok[0], -5) eq "_mask" && ($maxts == -1 || $tok[1] <= $maxts) && ($mints == -1 || $tok[1] >= $mints) ) || $var eq "mask" || ( ($maxts == -1 || $tok[1] <= $maxts) && ($mints == -1 || $tok[1] >= $mints) && ($level == -1 || substr($tok[2], 2) <= $level) ) ) { copyOrList("$var/$_"); } } } #END EXECUTED CODE ########################################## ########################################## #BEGIN FUNCTION DEFINITIONS #parses command-line options to set global variables sub parseOptions { #process any ARGVs while(@ARGV > 0) { #send any non-option arguments to argbuf #once we've emptied ARGV, we'll copy them back unless(substr($ARGV[0], 0, 1) eq "-") { push(@argbuf, $ARGV[0]); shift(@ARGV); next; } #remove the dash for "-" options $arg = substr($ARGV[0], 1); #remove that argument for handler shift @ARGV; #call the handler through an if-elsif-etc if($arg eq "ts0") { die "Invalid ts0.\n" if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); $mints = shift @ARGV; } elsif($arg eq "ts1") { die "Invalid ts1.\n" if($ARGV[0] < 0 || $ARGV[0] < $mints || $ARGV[0] + 0 != $ARGV[0]); $maxts = shift @ARGV; } elsif($arg eq "numts") { die "Invalid numts.\n" if($ARGV[0] <= 0 || $ARGV[0] + 0 != $ARGV[0]); $numts = shift @ARGV; } elsif($arg eq "vars") { @include = split(/:/, shift @ARGV); } elsif($arg eq "nvars") { @exclude = split(/:/, shift @ARGV); } elsif($arg eq "level") { die "Invalid level.\n" if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); $level = shift @ARGV; } elsif($arg eq "info") { $info = 1; $verbose = 0; } elsif($arg eq "list") { $list = 1; $verbose = 0; } elsif($arg eq "help") { print $usage; exit(0); } elsif($arg eq "v") { $verbose = 1 unless($info || $list); } elsif($arg eq "f") { $force = 1; } else { die "unrecognized option \"-$arg\", exiting...\n$usage"; } } #recover the non-optional arguments @ARGV = @argbuf; #map-ify the includes and excludes for faster finding %inc = map{$_ => $_} @include; %exc = map{$_ => $_} @exclude; #set up $mints and $maxts using $numts if $numts was given die "ts0 must be less than or equal to ts1!\n" if($maxts != -1 && $mints > $maxts && !($list || $info)); } #parses the non-optional arguments to get the source and target datasets sub parseArgs { #the remaining argument(s) should just be source and target die "Too few arguments\n" . $usage if(@ARGV < 1); die "Must provide target unless in info or list mode\n" . $usage if(@ARGV < 2 && $info == 0 && $list == 0); #get information about source and target from arguments #$ARGV[0] is the "source" argument. Must be .vdf #$ARGV[1] is the "dest" argument. May be .vdf or EXISTING directory. $srcvdf = $ARGV[0]; die "Source must be an existing *.vdf file.\n" unless(substr($srcvdf, -4, 4) eq ".vdf" && -f $srcvdf); $srcdir = $srcvdf; substr($srcdir, -4, 4, "_data"); die "Source data directory (\"$srcdir\") doesn't exist!\n" unless(-d $srcdir); if(substr($ARGV[1], -4, 4) eq ".vdf") { $dstvdf = $ARGV[1]; $dstdir = $dstvdf; substr($dstdir, -4, 4, "_data"); } else { @tok = split(/\//, $srcvdf); $dstvdf = $ARGV[1] . "/" . pop(@tok); $dstdir = $dstvdf; substr($dstdir, -4, 4, "_data"); die "Target directory (\"$ARGV[1]\") must exist!\n (Non-vdf names in target are interpreted as directory names)\n" unless(-d $ARGV[1] || $info == 1 || $list == 1); } #Disable any extra messages if -list is on if($info == 1) { $verbose = 0; $list = 0; } elsif ($list == 1) { $verbose = 0; } $dstvdf = "" if($info == 1); } #copies, or prints the item to stdout based on whether $list is on sub copyOrList { if($list == 1) { print "$srcdir/$_[0]\n"; return; } File::Copy::copy("$srcdir/$_[0]", "$dstdir/$_[0]") or die "failed to copy file \"$srcdir/$_[0]\" to \"$dstdir/$_[0]\": $!\n"; } #scans the first available variable to see what ranges are present #culls these to the ranges input by the user #dies with an error if the user asked for a range that is absent #prints the resulting information and exits if we are in info mode sub scanvars { #make sure we don't try to scan the mask folder die "no variables selected, or no selected variables available!\n" if(@vars < 1); if($vars[0] eq "mask") { die "no variables selected, or no selected variables available!\n" if(@vars < 2); $vars[0] = $vars[1]; $vars[1] = "mask"; } @varfiles = grep{-f "$srcdir/$vars[0]/$_"} dirContents("$srcdir/$vars[0]"); $amints = -1; $amaxts = $amints; my $curr; $alevel = -1; foreach(@varfiles) { @tok = split(/\./, $_); #ignore mask files for the purpose of LOD, but not for ts# if(substr($tok[0], -5) ne "_mask") { $curr = substr($tok[2], 2); $alevel = $curr if($curr > $alevel); } $curr = $tok[1]; $amaxts = $curr if($curr > $amaxts || $amaxts == -1); $amints = $curr if($curr < $amints || $amints == -1); } die "no timesteps available in selected dataset!\n" if($amints < 0 || $amints < 0); #correct numts unless($numts == -1) { $numts--; if($mints == -1) { if($maxts == -1) { $mints = $amints; $maxts = $mints + $numts; } else { $mints = $maxts - $numts; } } else { $maxts = $mints + $numts; } } die "ts0 is less than minimum timestep in dataset!\n" if($mints != -1 && $mints < $amints); die "ts1 is greater than maximum timestep in dataset!\n" if($maxts != -1 && $maxts > $amaxts); die "selected level is higher than available in dataset!\n" if($level != -1 && $level > $alevel); #cull the ranges to what the user selected if($maxts < $amaxts && $maxts != -1) { $amaxts = $maxts; $amints = $amaxts if($amints > $amaxts); } if($mints > $amints && $mints != -1) { $amints = $mints; $amaxts = $amints if($amaxts < $amints); } $alevel = $level if($level < $alevel && $level != -1); $mints = $amints; $maxts = $amaxts; $level = $alevel; return unless($info); #do the printing thing! yes! :D print "==========RANGE==========\n", "max LOD: ", $alevel, "\n", "first timestep: ", $amints, "\n", "last timestep: ", $amaxts, "\n"; print "========VARIABLES========\n"; foreach(@vars) { print "$_\n"; } exit(0); } #grabs the contents of a directory, removing '.' and '..' sub dirContents { opendir DIR, $_[0] or die "failed to open directory \"$_[0]\": $!\n"; my @buf = grep{$_ ne "." && $_ ne ".."} readdir DIR; closedir DIR; return @buf; } #END FUNCTION DEFINITIONS ########################################## #END OF FILE ########################################## |
|
From: Alan N. <ala...@us...> - 2013-05-22 16:40:07
|
Update of /cvsroot/vapor/vapor/make/win32/common In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15178/make/win32/common Modified Files: common.sln Log Message: Windows 64bit installer updates. Index: common.sln =================================================================== RCS file: /cvsroot/vapor/vapor/make/win32/common/common.sln,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** common.sln 8 May 2013 17:36:05 -0000 1.43 --- common.sln 22 May 2013 16:40:04 -0000 1.44 *************** *** 117,120 **** --- 117,121 ---- {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|Win32.ActiveCfg = Release|Win32 {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|x64.ActiveCfg = Release|x64 + {D6470EA9-EF19-437A-AAB2-794FA21BC76D}.Release|x64.Build.0 = Release|x64 {58AD122F-0E8E-4F94-A503-E030309B280D}.Debug|Win32.ActiveCfg = Debug|Win32 {58AD122F-0E8E-4F94-A503-E030309B280D}.Debug|x64.ActiveCfg = Debug|x64 |
|
From: Miles R-L <mi...@us...> - 2013-05-22 16:23:55
|
Update of /cvsroot/vapor/vapor/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14424 Modified Files: vdfcp Log Message: Index: vdfcp =================================================================== RCS file: /cvsroot/vapor/vapor/scripts/vdfcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vdfcp 20 May 2013 22:45:45 -0000 1.4 --- vdfcp 22 May 2013 16:23:52 -0000 1.5 *************** *** 17,21 **** # PO 3000, Boulder, Colorado # ! # Date: Fri Jan 13 18:00:32 MST 1995 # # Description: A command-line utility for copying .vdf datasets --- 17,21 ---- # PO 3000, Boulder, Colorado # ! # Date: Fri Mar 13 18:00:32 MST 2013 # # Description: A command-line utility for copying .vdf datasets *************** *** 33,37 **** #some warnings are expected in normal execution #use warnings; - use Switch; use File::Copy; use File::Path; --- 33,36 ---- *************** *** 217,283 **** #remove that argument for handler shift @ARGV; ! #call the handler through a switch ! switch($arg) { ! case "ts0" ! { ! die "Invalid ts0.\n" ! if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); ! $mints = shift @ARGV; ! } ! case "ts1" ! { ! die "Invalid ts1.\n" ! if($ARGV[0] < 0 || $ARGV[0] < $mints ! || $ARGV[0] + 0 != $ARGV[0]); ! $maxts = shift @ARGV; ! } ! case "numts" ! { ! die "Invalid numts.\n" ! if($ARGV[0] <= 0 || $ARGV[0] + 0 != $ARGV[0]); ! $numts = shift @ARGV; ! } ! case "vars" ! { ! @include = split(/:/, shift @ARGV); ! } ! case "nvars" ! { ! @exclude = split(/:/, shift @ARGV); ! } ! case "level" ! { ! die "Invalid level.\n" ! if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); ! $level = shift @ARGV; ! } ! case "info" ! { ! $info = 1; ! $verbose = 0; ! } ! case "list" ! { ! $list = 1; ! $verbose = 0; ! } ! case "help" ! { ! print $usage; ! exit(0); ! } ! case "v" ! { ! $verbose = 1 unless($info || $list); ! } ! case "f" ! { ! $force = 1; ! } ! else ! { ! die "unrecognized option \"-$arg\", exiting...\n$usage"; ! } } } --- 216,279 ---- #remove that argument for handler shift @ARGV; ! #call the handler through an if-elsif-etc ! if($arg eq "ts0") { ! die "Invalid ts0.\n" ! if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); ! $mints = shift @ARGV; ! } ! elsif($arg eq "ts1") ! { ! die "Invalid ts1.\n" ! if($ARGV[0] < 0 || $ARGV[0] < $mints ! || $ARGV[0] + 0 != $ARGV[0]); ! $maxts = shift @ARGV; ! } ! elsif($arg eq "numts") ! { ! die "Invalid numts.\n" ! if($ARGV[0] <= 0 || $ARGV[0] + 0 != $ARGV[0]); ! $numts = shift @ARGV; ! } ! elsif($arg eq "vars") ! { ! @include = split(/:/, shift @ARGV); ! } ! elsif($arg eq "nvars") ! { ! @exclude = split(/:/, shift @ARGV); ! } ! elsif($arg eq "level") ! { ! die "Invalid level.\n" ! if($ARGV[0] < 0 || $ARGV[0] + 0 != $ARGV[0]); ! $level = shift @ARGV; ! } ! elsif($arg eq "info") ! { ! $info = 1; ! $verbose = 0; ! } ! elsif($arg eq "list") ! { ! $list = 1; ! $verbose = 0; ! } ! elsif($arg eq "help") ! { ! print $usage; ! exit(0); ! } ! elsif($arg eq "v") ! { ! $verbose = 1 unless($info || $list); ! } ! elsif($arg eq "f") ! { ! $force = 1; ! } ! else ! { ! die "unrecognized option \"-$arg\", exiting...\n$usage"; } } |
|
From: clynejp <cl...@us...> - 2013-05-22 04:35:06
|
Update of /cvsroot/vapor/vapor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12689 Modified Files: Makefile Log Message: Added system math libraries (libblas, lapack, etc) to installer Index: Makefile =================================================================== RCS file: /cvsroot/vapor/vapor/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile 10 Oct 2012 22:44:21 -0000 1.34 --- Makefile 22 May 2013 04:35:04 -0000 1.35 *************** *** 27,31 **** CLD_EXCLUDE_FLAGS = $(addprefix -exclude , $(CLD_EXCLUDE_LIBS)) ! CLD_INCLUDE_FLAGS = -include ^$(QTDIR)/lib LDLIBPATHS = -ldlibpath $(QTDIR)/lib --- 27,32 ---- CLD_EXCLUDE_FLAGS = $(addprefix -exclude , $(CLD_EXCLUDE_LIBS)) ! CLD_INCLUDE_FLAGS = $(addprefix -include , $(CLD_INCLUDE_LIBS)) ! CLD_INCLUDE_FLAGS += -include ^$(QTDIR)/lib LDLIBPATHS = -ldlibpath $(QTDIR)/lib *************** *** 41,44 **** --- 42,47 ---- $(CP) $(PYTHONDIR)/bin/python $(INSTALL_BINDIR) $(CP) -R $(PYTHONDIR)/include/python$(PYTHONVERSION) $(INSTALL_PREFIX_DIR)/include + @$(ECHO) "Copying Python plugin library dependencies to $(INSTALL_LIBDIR)" + $(PERL) $(TOP)/buildutils/copylibdeps.pl -arch $(ARCH) $(LDLIBPATHS) $(CLD_EXCLUDE_FLAGS) $(CLD_INCLUDE_FLAGS) $(INSTALL_LIBDIR)/python$(PYTHONVERSION)/site-packages/numpy/linalg/*.so $(INSTALL_LIBDIR) endif |
|
From: clynejp <cl...@us...> - 2013-05-21 23:31:10
|
Update of /cvsroot/vapor/vapor/apps/mom2vdf In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31143/mom2vdf Modified Files: mom2vdf.cpp Log Message: Cleaned up failure diagnostics Index: mom2vdf.cpp =================================================================== RCS file: /cvsroot/vapor/vapor/apps/mom2vdf/mom2vdf.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mom2vdf.cpp 14 May 2013 15:13:12 -0000 1.20 --- mom2vdf.cpp 21 May 2013 23:31:07 -0000 1.21 *************** *** 472,475 **** --- 472,476 ---- } if (! momData->VariableExists(itr->second, variables[v])) { + cout << "does not exist!" << endl; continue; } *************** *** 482,485 **** --- 483,487 ---- if (rc<0) { MyBase::SetErrCode(0); // must clear error code + cout << endl; fails++; } |