From 66816b75d5e3e7b67140ec913296ea773e2ed759 Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Wed, 19 Jan 2022 12:06:23 -0500 Subject: [PATCH] fixed order craterlist.in is read in crater_populate --- examples/global-lunar-bombardment/craterlist.in | 2 +- src/crater/crater_populate.f90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in index 88f9479e..bf096d1d 100644 --- a/examples/global-lunar-bombardment/craterlist.in +++ b/examples/global-lunar-bombardment/craterlist.in @@ -1,4 +1,4 @@ -#Dcrat(m) vel(m/s) ang(deg) xoffset(km) yoffset(km) t(Ga) +#Dcrat(m) vel(m/s) ang(deg) xoffset(m) yoffset(m) t(Ga) 2050000 18300.0 45.0 -2908888.89 -1848000.0 4.31 690000 18300.0 45.0 889777.778 -157422.222 4.309 264656 18300.0 45.0 1186318.17 -534322.694 4.308 diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90 index d9985848..a0530cc0 100644 --- a/src/crater/crater_populate.f90 +++ b/src/crater/crater_populate.f90 @@ -163,8 +163,8 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt user%testimp = rclist(1, rccount) user%testvel = rclist(2, rccount) user%testang = rclist(3, rccount) - user%testxoffset = rclist(5, rccount) !x-offset is longitude - user%testyoffset = rclist(4, rccount) !y-offset is latitude + user%testxoffset = rclist(4, rccount) + user%testyoffset = rclist(5, rccount) end if end if ! generate random crater