[Crop and Soil] Enable crop and soil only simulation run by matthew7838 · Pull Request #2932 · RuminantFarmSystems/RuFaS

matthew7838 · 2026-04-03T16:20:04Z

Isolate the crop and soil module from the feed module simulation run.

Context

Issue(s) closed by this pull request: closes #2765

What

Added a function called _execute_daily_field_only_operations that focuses solely on the operations of the Field module, without any usage of the Feed module, including storage operations.
Renamed _execute_daily_field__operations to _execute_daily_field_with_storage_operations. Works the same, but utilizes the extracted _execute_daily_field_only_operations.
Added _execute_field_only_simulation, which will not run any harvest storage operations.
Added _execute_field_with_storage_simulation, which will run the Field module with storage operations, but will skip feed and ration planning.
Added two new simulation types, FIELD_ONLY and FIELD_WITH_STORAGE.

Why

The Crop and Soil module should be isolable from the rest of RUFAS. This is necessary for evaluating and testing crop and soil features and would provide new simulation options for research and decision-making workflows.

How

This PR further subdivided the responsibility of each simulation type.

Test plan

SME review.
Updated unit tests.

Input Changes

Output Changes

N/A

Filter

github-actions · 2026-04-03T16:26:17Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1198
Mypy errors on dev branch: 1198
No difference in error counts

github-actions · 2026-04-03T16:26:18Z

🚨 Please update the changelog. This PR cannot be merged until changelog.md is updated.

…-feed-run # Conflicts: # RUFAS/simulation_engine.py

github-actions · 2026-04-04T10:10:30Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1198
Mypy errors on dev branch: 1198
No difference in error counts

github-actions · 2026-04-04T10:10:31Z

🚨 Please update the changelog. This PR cannot be merged until changelog.md is updated.

…-feed-run # Conflicts: # RUFAS/simulation_engine.py

github-actions · 2026-04-04T11:24:09Z

Current Coverage: %

Mypy errors on separate-feed-run branch: 1198
Mypy errors on dev branch: 1198
No difference in error counts

github-actions · 2026-04-04T11:24:10Z

🚨 Please update the changelog. This PR cannot be merged until changelog.md is updated.
🚨 Some tests have failed.

…-feed-run

github-actions · 2026-04-04T11:37:58Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1198
Mypy errors on dev branch: 1198
No difference in error counts

morrowcj

This looks correct to me. Well done.

I ran the model with both "example_field_only_tasks.json" and "example_field_with_storage_task.json". Those and pytest ran with no issues.

morrowcj · 2026-04-06T17:36:47Z

+    "random_seed": 42,
+    "set_seed": true,
+    "simulation_type": "field_only",
+    "nutrient_standard": "NASEM",


As we discussed, nutrient_standard is one of the many parameters not strictly required by "field_only" (and possibly "field_and_storage"). I think this is covered by #2894, but wanted to mention it here to keep it on the radar.

github-actions · 2026-04-06T19:06:48Z

Current Coverage: %

Mypy errors on separate-feed-run branch: 1205
Mypy errors on dev branch: 1205
No difference in error counts

github-actions · 2026-04-06T19:06:48Z

🚨 Flake8 linting errors were found. Please fix the linting issues.
🚨 Some tests have failed.

…-feed-run

github-actions · 2026-04-07T08:39:13Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1191
Mypy errors on dev branch: 1191
No difference in error counts

github-actions · 2026-04-07T08:41:01Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1191
Mypy errors on dev branch: 1191
No difference in error counts

github-actions · 2026-04-07T14:49:24Z

Current Coverage: 99%

Mypy errors on separate-feed-run branch: 1191
Mypy errors on dev branch: 1191
No difference in error counts

ew3361zh · 2026-04-07T21:59:18Z

How are you handling manure applications on a farm without a manure module?

ew3361zh · 2026-04-08T13:48:15Z


        self._advance_time()

+    def _execute_field_with_storage_simulation(self) -> None:


How does this differ from the FIELD_AND_FEED simulation in scientific outcomes/intent?

The intent was to have an option where ration formulation was not performed, requiring no animal or nutritiion inputs

ew3361zh · 2026-04-08T14:02:20Z

        self._simulation_type_to_daily_simulation_function = {
            SimulationType.FULL_FARM: self._execute_full_farm_daily_simulation,
            SimulationType.FIELD_AND_FEED: self._execute_field_and_feed_daily_simulation,
+            simulation_type.FIELD_ONLY: self._execute_field_only_simulation,


I think for these simulations where we're isolating single parts of the model we want to be sure they can run without any other parts of the model being initialized.

FIELD_ONLY still depends on a Manure module. I know we'd talked about how to get manure applications out of the Manure module potentially - did you look into that at all?

I'm working on something that was initially separating out feed management from ration planning but has grown into initializing only modules that should be required for the simulation being run by the user. Maybe we can take a look at it and see how it can fit together with this.

matthew7838 and others added 4 commits April 4, 2026 00:56

Implemented separate run

2bed6d5

Removed animal related input

e868d0d

Merge e868d0d into 1916ac3

45f5495

Apply Black Formatting

31a3249

matthew7838 and others added 4 commits April 4, 2026 19:04

Added field with storage run

81e3c96

Merge remote-tracking branch 'origin/separate-feed-run' into separate…

fd33f8f

…-feed-run # Conflicts: # RUFAS/simulation_engine.py

Merge fd33f8f into 444b655

1cea3bb

Apply Black Formatting

c23078c

matthew7838 changed the base branch from dev to wiki-links April 4, 2026 10:17

matthew7838 changed the base branch from wiki-links to dev April 4, 2026 10:17

matthew7838 and others added 5 commits April 4, 2026 20:16

Updated metadata and added overwritten functions

88522d4

Merge remote-tracking branch 'origin/separate-feed-run' into separate…

2d74255

…-feed-run # Conflicts: # RUFAS/simulation_engine.py

Merge 2d74255 into 444b655

2be5a5c

Apply Black Formatting

3f81d92

Update badges on README

f269a2c

matthew7838 and others added 6 commits April 4, 2026 20:26

Updated changelog.md

368935a

Merge remote-tracking branch 'origin/separate-feed-run' into separate…

bb4b63f

…-feed-run

Updated tests

6b93d7b

Merge 6b93d7b into 444b655

e3024df

Apply Black Formatting

3e9212d

Update badges on README

cffe1a5

matthew7838 marked this pull request as ready for review April 4, 2026 11:45

matthew7838 requested a review from morrowcj April 4, 2026 11:45

matthew7838 requested a review from ew3361zh April 6, 2026 14:45

ew3361zh reviewed Apr 6, 2026

View reviewed changes

Comment thread tests/test_simulation_engine.py Outdated

morrowcj approved these changes Apr 6, 2026

View reviewed changes

matthew7838 and others added 3 commits April 7, 2026 04:00

Merge branch 'dev' into separate-feed-run

2c11dcf

Merge 2c11dcf into f794363

dfc46c3

Apply Black Formatting

114c46f

matthew7838 and others added 6 commits April 7, 2026 17:33

Merge branch 'dev' into separate-feed-run

d130f10

Merge d130f10 into 472a3fe

4282c4d

Addressed Niko's comments on improving unit test

27f0566

Revert changes for testing purpose

9c9f991

Apply Black Formatting

5915db4

Merge remote-tracking branch 'origin/separate-feed-run' into separate…

ade0c02

…-feed-run

matthew7838 requested a review from ew3361zh April 7, 2026 08:34

matthew7838 and others added 2 commits April 7, 2026 17:34

Merge ade0c02 into 472a3fe

ec65507

Apply Black Formatting

f5f8ff1

matthew7838 and others added 3 commits April 7, 2026 23:43

Merge branch 'dev' into separate-feed-run

0391a47

Merge 0391a47 into 5334967

3e9b2d0

Apply Black Formatting

a31591f

ew3361zh reviewed Apr 8, 2026

View reviewed changes

Separate field manure supplier into data structures

27d9be5


		self._advance_time()

		def _execute_field_with_storage_simulation(self) -> None:

Conversation

matthew7838 commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context

What

Why

How

Test plan

Input Changes

Output Changes

Filter

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 4, 2026

Uh oh!

github-actions bot commented Apr 4, 2026

Uh oh!

github-actions bot commented Apr 4, 2026

Uh oh!

github-actions bot commented Apr 4, 2026

Uh oh!

github-actions bot commented Apr 4, 2026

Uh oh!

Uh oh!

morrowcj left a comment

Choose a reason for hiding this comment

Uh oh!

morrowcj Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

github-actions bot commented Apr 7, 2026

Uh oh!

github-actions bot commented Apr 7, 2026

Uh oh!

github-actions bot commented Apr 7, 2026

Uh oh!

ew3361zh commented Apr 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ew3361zh Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

morrowcj Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

ew3361zh Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

matthew7838 commented Apr 3, 2026 •

edited

Loading

ew3361zh commented Apr 7, 2026 •

edited

Loading