Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup fortran files #54

Merged
merged 12 commits into from
May 14, 2019
Merged

Cleanup fortran files #54

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
baece1f
remove unused files
jklenzing Apr 29, 2019
d7be418
Update msis file with official release
jklenzing Apr 29, 2019
632c5ed
update setup
jklenzing Apr 30, 2019
52113b9
xenial for all
jklenzing May 1, 2019
8c51f1d
xm as real
jklenzing May 11, 2019
a84415a
dimensions update
jklenzing May 11, 2019
2de5380
update to official release of hwm-14
jklenzing May 11, 2019
9e047c3
restore coveralls
jklenzing May 11, 2019
5a23d80
update readme
jklenzing May 11, 2019
5d02d27
increment alpha tag
jklenzing May 11, 2019
83500a2
restore full name for nrlmsise00_modified
jklenzing May 13, 2019
9d935cd
change to unix line endings
jklenzing May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
language: python
dist: xenial
matrix:
include:
- python: 2.7
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial
sudo: true

addons:
apt:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Note that the sami2 model runs for 24 hours to clear transients, then begins to
Now load the resultant data:

```
ModelRun = sami2py.model(tag='test', lon=0, year=2012, day=210)
ModelRun = sami2py.Model(tag='test', lon=0, year=2012, day=210)
```

Plotting features coming soon...
Expand Down
4 changes: 2 additions & 2 deletions sami2py/fortran/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ gf = gfortran -fno-range-check -fno-automatic -ffixed-line-length-none

#
compile:
$(gf) -c nrlmsise00_modified.f
$(gf) -c nrlmsise00_mod.f
$(gf) -c grid-1.00.f
$(gf) -c sami2py-1.00.f
$(gf) -c hwm93.f
$(gf) -c hwm07e_modified.f90
$(gf) -c apexcord.f90
$(gf) -c hwm14.f90
$(gf) -o sami2py.x sami2py-1.00.o grid-1.00.o hwm93.o hwm07e_modified.o hwm14.o apexcord.o nrlmsise00_modified.o
$(gf) -o sami2py.x sami2py-1.00.o grid-1.00.o hwm93.o hwm07e_modified.o hwm14.o apexcord.o nrlmsise00_mod.o

#
clean:
Expand Down
0 sami2py/fortran/dwm07b_104i.dat → sami2py/fortran/dwm07b104i.dat
View file
Open in desktop
File renamed without changes.
0 sami2py/fortran/hwm14-beta.bin → sami2py/fortran/hwm123114.bin
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions sami2py/fortran/hwm14.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
!!! Horizontal Wind Model 14
!!!
!!! AUTHORS
!!! Douglas P. Drob (0 to ~450+ km, quite-time)
!!! and John Emmert (disturbance winds, DWM Emmert et al., (2008))
!!! Douglas Drob (0 to ~450+ km, quite-time)
!!! John Emmert (disturbance winds, DWM Emmert et al., (2008))
!!! Geospace Science and Technology Branch
!!! Space Science Division
!!! Naval Research Laboratory
!!! 4555 Overlook Ave.
!!! Washington, DC 20375
!!!
!!! Point of Contact
!!! Point of Contact
!!! douglas.drob@nrl.navy.mil
!!!
!!! DATE
!!! July 8, 2014
!!!
!!!
!!!
!!!================================================================================
!!! Input arguments:
!!! iyd - year and day as yyddd
Expand Down Expand Up @@ -235,7 +237,7 @@ module qwm
logical :: content(5) = .true. ! Season/Waves/Tides
logical :: component(0:1) = .true. ! Compute zonal/meridional

character(128) :: qwmdefault = 'hwm14-beta.bin'
character(128) :: qwmdefault = 'hwm123114.bin'
logical :: qwminit = .true.

real(8) :: wavefactor(4) = 1.0
Expand Down Expand Up @@ -265,7 +267,7 @@ module dwm
real(8), parameter :: dtor=pi/180.d0

logical :: dwminit = .true.
character(128), parameter :: dwmdefault = 'dwm07b_104i.dat'
character(128), parameter :: dwmdefault = 'dwm07b104i.dat'

end module dwm

Expand Down Expand Up @@ -1436,7 +1438,7 @@ subroutine findandopen(datafile,unitid)
inquire(file=trim(datafile),exist=havefile)
if (havefile) open(unit=unitid,file=trim(datafile),status='old',form='unformatted')
if (.not. havefile) then
call GET_ENVIRONMENT_VARIABLE('HWMPATH',hwmpath)
call get_environment_variable('HWMPATH',hwmpath)
inquire(file=trim(hwmpath)//'/'//trim(datafile),exist=havefile)
if (havefile) open(unit=unitid, &
file=trim(hwmpath)//'/'//trim(datafile),status='old',form='unformatted')
Expand All @@ -1450,7 +1452,7 @@ subroutine findandopen(datafile,unitid)
inquire(file=trim(datafile),exist=havefile)
if (havefile) open(unit=unitid,file=trim(datafile),status='old',access='stream')
if (.not. havefile) then
call GET_ENVIRONMENT_VARIABLE('HWMPATH',hwmpath)
call get_environment_variable('HWMPATH',hwmpath)
inquire(file=trim(hwmpath)//'/'//trim(datafile),exist=havefile)
if (havefile) open(unit=unitid, &
file=trim(hwmpath)//'/'//trim(datafile),status='old',access='stream')
Expand Down
Loading