Skip to content

Commit

Permalink
Merge pull request #229 from gonuke/neep_update
Browse files Browse the repository at this point in the history
update to NEEP
  • Loading branch information
connoramoreno authored Nov 9, 2023
2 parents e88f995 + b2c1de1 commit c7bc3b0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions _data/uw_navbar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
- name: "College of Engineering"
url: "https://www.engr.wisc.edu/"

- name: "Engineering Physics"
url: "https://www.engr.wisc.edu/ep"
- name: "Nuclear Engineering & Engineering Physics"
url: "https://engineering.wisc.edu/neep"
2 changes: 1 addition & 1 deletion community/manual/expectations.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ minimum standard.

### Seminars

The Engineering Physics department conducts a regular seminar series with a wide
The Nuclear Engineering & Engineering Physics department conducts a regular seminar series with a wide
range of topics from all the research areas of the department. These seminars
are generally scheduled on Tuesdays at 12 PM and you should receive notification
from the department office. All graduate students in the EP department are
Expand Down
2 changes: 1 addition & 1 deletion community/people/keb/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ city_state_zip: "Lemont, IL 60439"

## Education and Prior Work

* University of Wisconsin - Madison, PhD candidate in Engineering Physics (2017-current)
* University of Wisconsin - Madison, PhD candidate in Nuclear Engineering & Engineering Physics (2017-current)
* Manager, PowerAdvocate Client Services (energy consulting group) (2015-2017)
* Massachusetts Institute of Technology, BS in Nuclear Science and Engineering (2015)
4 changes: 2 additions & 2 deletions community/people/pphw/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ twitter-feed: true

Paul Wilson is the Grainger Professor of Nuclear Engineering and current
department chair of the [University of Wisconsin-Madison](http://www.wisc.edu)‘s
[Department of Engineering Physics](http://www.engr.wisc.edu/ep). His research
[Department of Nuclear Engineering & Engineering Physics](http://engineering.wisc.edu/neep). His research
interests focus on developing improved tools for computational modeling of
complex nuclear energy systems, with applications in radiation shielding,
nuclear waste management, nuclear non-proliferation and energy policy. Paul
Expand Down Expand Up @@ -64,5 +64,5 @@ Paul is married and has two daughters. They enjoy biking around Madison’s path
floating on its lakes, eating at its restaurants, and enjoying its theaters.

* Students who would like to request a reference should review [these
guidelines](reference_request.md).
guidelines]( {% link community/people/pphw/reference_request.md %}).
* [A shorter bio]({% link community/people/pphw/nontech.md %})
2 changes: 1 addition & 1 deletion community/people/pphw/nontech.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ twitter-feed: true

Paul Wilson is the Grainger Professor of Nuclear Engineering and current
department chair of the [University of Wisconsin-Madison](http://www.wisc.edu)‘s
[Department of Engineering Physics](http://www.engr.wisc.edu/ep). His research
[Department of Nuclear Engineering & Engineering Physics](http://engineering.wisc.edu/neep). His research
uses computer models to improve the designs of complex nuclear energy systems
and to shed light on important policy apsects of the nuclear fuel cycle,
including nuclear waste management and non-proliferation. Paul joined the
Expand Down

0 comments on commit c7bc3b0

Please sign in to comment.