From e745270da4e09a562d0fe2ed3a88fb23fd0f6f22 Mon Sep 17 00:00:00 2001
From: Bill Ladwig <ladwig@ucar.edu>
Date: Thu, 25 Jan 2018 16:34:37 -0700
Subject: [PATCH] Fix issues related to windows and linux.

---
 conda_recipe/bld.bat            |   2 +-
 conda_recipe/build.sh           |   2 +-
 fortran/build_help/sizes        | Bin 8944 -> 0 bytes
 fortran/build_help/sub_sizes.py |   5 ++++-
 4 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100755 fortran/build_help/sizes

diff --git a/conda_recipe/bld.bat b/conda_recipe/bld.bat
index 75330f6..d4a4a3f 100644
--- a/conda_recipe/bld.bat
+++ b/conda_recipe/bld.bat
@@ -1,4 +1,4 @@
-cd ..\fortran\build_help
+cd fortran\build_help
 CALL gfortran -o sizes -fopenmp omp_sizes.f90
 CALL python sub_sizes.py
 
diff --git a/conda_recipe/build.sh b/conda_recipe/build.sh
index c2a91d1..eefecaf 100644
--- a/conda_recipe/build.sh
+++ b/conda_recipe/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd ../fortran/build_help
+cd fortran/build_help
 gfortran -o sizes -fopenmp omp_sizes.f90
 python sub_sizes.py
 
diff --git a/fortran/build_help/sizes b/fortran/build_help/sizes
deleted file mode 100755
index 2be4af52a4e016614d156b72246e39da6c6c9c01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8944
zcmeHNU1(fI6rN3!G_C#F+ESvmuq{nV1vjZRnnH_-G<2h}rcEo-J`9`Po9ycTdG8JV
z0U;t0LkaXjMJ<Se&-zkDLeU4sRDG~osUXq{QrSX<;G0@{{l2+#dw;TVUwya-=FXfs
z=X~ePnYnu>Gx_fCKklp)BC$e<=@ucxMwEJ+5Hli$mJs)$WKg6W9XvR6eCWtC><v>Q
z%r@kR(+vkw9vyn_XjnzrC&PV0^N39#9MP`DQrgBT+t-carSHLDAT}`|68R9dis>LP
zrDaczTX(ync<-%q@pfnpkM|5ZG@c(H@npd$)eI9#QM@lT-iQVu&%EEICGq7f+bmWl
zwL%mxx!#QrFp9_rDTEDyl(}lf@)H=vOKChWKJu+Wz(`w4qaY{DY}s%HQM{VQdrjMs
z*HaTga#^mEI*ODB29FK~RInaG>%?0xfptP$Z@f}gO42%A9<P>U%{G_C^I*8%f^l&^
zy*XtRQkJs+g_ndq<Ljj|h<p%_>$pQn+=u^OjSL@pYUseQ_fDiD;{;Dy)B_`q%7f|^
zVmsbj<um2tccAXnGFB<@mr&PHQ;#r|r?v^fSEB;}%s1PkC?x85g>z4z%h6@vcxx}H
z!@d;C8kC+X%j_u?$9wXpOL_35Ehvn`*;37oyt(J%>(^FP|4Loo$@dJY6D!xOhVg3g
zpyp92>c)6!my0;1pMDg|7`wY_Tg8A`%i0BcpPZ<gwwbM@_oNX=aa<{>_?Q>p&K-Hc
zu3E08cY8KbKP~&NB1H**j6fbcZP`XS{e)*jPqfQ~{3O7^?wDnmR!=FLKUtjYDHkh6
zyr22(!zy2lI+v4{?_S}A$LZqu@xC~f&6hFebZ^lAPIzNpJ277!sCQ|e>ma5$191l8
z48$2|mVslL*&CUcZ~cnj+{|3tWqjZ>voqay9A{ys7f)_f7iLmuO{>-pw77}L%&E@I
z>_WYtHZD6)^~_w~+X`l(zRMR;bCY7*UQp7269P7Ias}To&j~-^aI#N3`NkK~$w!K9
zYmYkNC%=i4ijOqUFAAJoXBSWnUqtpv*U9@z8W;(!nmAeIBY95FD42yhKl6da-f-t+
zU)0H}=1x9PrfQ1jb-K1{C+B?;M>6d?`H59<;;~n0Hj>AEB+to31+!3p)ECjo7R9!i
zN*YKPw`fh$^)pl=6MsTG`Q8`N$tQ|!TN`!4eM%E2Q$CV6l56Y&YRMOoJq-5iFVsu(
z%B|$=OSdz#Q;V6i#}>~Hp?MV=Ta`iISExScnycT-#~ZgD=TkIb>~uYk5S^})dREl4
zrk>1?(`Dm1GPiX<s=+a*>mk(V3N*d>yW=>8``P-1t;g8<fh|UL^AcM%wmxI)9kwo@
zh0UI{if0TfJ+YVj!m;7wLu079E=XLnB=}MLOuRTDIsncIbW)GSqfNSzICDfKP9+n`
zH7h&LLE#bfKY;S?KL`TU=V7$cdR_9>mR9zxZEx*G4I?ll+VM|^^Z2PD?Pn)xi5+*1
zzMax(@c0q?YI?k;>$<N0)b(v$x9h*_8bHKdaR%ZH#2JV)5N9CHK%9X%191l848$3T
zGZ1GW&cOdH0~@v{pJhlJ2Y5NBF2m(`v69E-^<h(-6J~P5fRx_dnY0XBX3a^9lFlWP
zYRxX<cA3IdSZK?WX3;h%>24^I`D#UpdqZMg*jW>XDRYIana$Z~-397ztXZts#$-TG
zCp;nXe*`VET#&{oBR6FmxTDW<nA^(PVnuY}zz-L;zwr!)^x@`@dC)4pMOlXf5%2#B
zu8_yU?WjKgpxOEaZ`Ry%lg)~E?<aYVLOj%LD&m<^kUtpVPegb-!oL;a=Uv`AEmG%H
zJXdD$JW%5~5syH5LJ1n+IaVWi3OC$Kb0bx58qI&C&zt#Rw>Rev`rO$L2$r4aMmpgc
aUb1fG(}Tl@q!dyImF`dP-rLK>gZ>3(b0{|e

diff --git a/fortran/build_help/sub_sizes.py b/fortran/build_help/sub_sizes.py
index 10aa3a3..e61bd6d 100644
--- a/fortran/build_help/sub_sizes.py
+++ b/fortran/build_help/sub_sizes.py
@@ -5,7 +5,10 @@ from string import Template
 def main():
     
     print ("Running sub_sizes")
-    result = subprocess.check_output(["./sizes"])
+    try:
+        result = subprocess.check_output(["./sizes"])
+    except WindowsError:
+        result = subprocess.check_output(["sizes.exe"])
     
     split_result = result.split()