Skip to content

Commit 70c0b75

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into rc-4.0.2
2 parents e4fff35 + 1045e5d commit 70c0b75

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

docs/changelogs/ReleaseProcess.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
1. Create release changelog.md
66
2. Post PR with contents of the changelog/release notes
77
3. Get reviews and address all issues
8+
4. Add changelog for the release -- include all PR's that will be included
89

910
### PR branch updates
1011
1. checkout branch to merge in and verify builds on VS if any changes for VS or new files added
@@ -40,14 +41,15 @@ After posting and tagging release
4041
* `rm -rf vs-build`
4142
* `git checkout vs-build`
4243
3. Set a couple of VS files to not track changes on files that VS wants to update Windows related stuff in
43-
```
44+
```
4445
git update-index --assume-unchanged vs-build/MAPlib/MAP_dll.vcxproj vs-uild/Registry/FAST_Registry.vcxproj
4546
```
4647

4748
4. Compile executables for Windows builds
4849
* Run one of the executables and check the version info. Muck about with VS if there is an issue.
4950
* Also run `dumpbin.exe /dependents <exe>.exe` to check static linking
5051
* NOTE: build the simulink last -- it messes up some things otherwise
52+
- [ ] AeroDisk_Driver_x64.exe
5153
- [ ] AeroDyn_Driver_x64.exe
5254
- [ ] AeroDyn_Driver_x64_OpenMP.exe
5355
- [ ] AeroDyn_Inflow_C_Binding_x64.dll
@@ -69,9 +71,11 @@ After posting and tagging release
6971
- [ ] MoorDyn_C_Binding_x64.dll
7072
- [ ] OpenFAST-Simulink_x64.dll -- change `additional dependencies` in the `OpenFAST-Simulink` project in `FAST` to point to correct install of MATLAB
7173
- [ ] openfast_x64.exe
74+
- [ ] SeaStateDriver_x64.exe
75+
- [ ] SimpleElastoDyn_x64.exe
7276
- [ ] SubDyn_x64.exe
7377
- [ ] Turbsim_x64.exe
74-
78+
- [ ] UnsteadyAero_x64.exe
7579
5. Upload all filesUnset the no tracking of files
7680
```
7781
git ls-files -v | grep "^[a-z]"

modules/externalinflow/src/ExternalInflow.f90

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ SUBROUTINE SetExtInfwPositions(p_FAST, u_AD, ExtInfw, ErrStat, ErrMsg)
423423
ExtInfw%u%xdotForce(Node) = real(ExtInfw%m%ActForceMotionsPoints(k)%TranslationVel(1,J),c_float)
424424
ExtInfw%u%ydotForce(Node) = real(ExtInfw%m%ActForceMotionsPoints(k)%TranslationVel(2,J),c_float)
425425
ExtInfw%u%zdotForce(Node) = real(ExtInfw%m%ActForceMotionsPoints(k)%TranslationVel(3,J),c_float)
426-
ExtInfw%u%pOrientation((Node-1)*9_1:Node*9) = real(pack(ExtInfw%m%ActForceMotionsPoints(k)%Orientation(:,:,J),.true.),c_float)
426+
ExtInfw%u%pOrientation((Node-1)*9+1:Node*9) = real(pack(ExtInfw%m%ActForceMotionsPoints(k)%Orientation(:,:,J),.true.),c_float)
427427
END DO
428428

429429
END DO

reg_tests/CTestList.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ of_aeromap_regression("5MW_Land_AeroMap" "aeromap;elastodyn;aerody
359359
if(BUILD_OPENFAST_CPP_DRIVER)
360360
of_cpp_interface_regression("5MW_Land_DLL_WTurb_cpp" "openfast;fastlib;cpp")
361361
of_cpp_interface_regression("5MW_Restart_cpp" "openfast;fastlib;cpp;restart")
362+
of_cpp_interface_regression("5MW_Land_DLL_WTurb_ExtInfw_cpp" "openfast;fastlib;extinfw;cpp")
362363
endif()
363364

364365
# OpenFAST Driver test for OpenFAST C++ Library

0 commit comments

Comments
 (0)