Initial condition for jw test #446

OngChia · 2024-04-18T07:07:43Z

Initial condition for JW test is added in initialization_utils.py. The auxiliary functions that help compute the initial condition is stored in testcase_functions.py.
DiagnosticState and DiagnosticMetricState are added. DiagnosticState contains global diagnostic variables that will be used in physics parameterizations. DiagnosticMetricState contains metric state for computations of diagnostic variables from prognostic variables.
A new JABW_EXPERIMENT serialized data set is added to test the initial condition of JW test.
A new C2E2C2E dim for rbf vector interpolation from edge to cell is added.

…branch.

…sory test for JW initial condition to test_testcase.py. Fixed a few bugs.

…DO remap.

…output the grid data for remapping.

model/common/src/icon4py/model/common/grid/horizontal.py

model/common/src/icon4py/model/common/states/diagnostic_state.py

halungge · 2024-04-23T11:07:03Z

model/driver/src/icon4py/model/driver/icon_configuration.py

        )

-    if experiment == "mch_ch_r04b09_dsl":
+    def _Jablownoski_Williamson_config():


I would name this in proper snake case to conform to the standard, even though I know these are names.

Thanks. Renamed already.

model/driver/tests/test_testcase.py

halungge · 2024-04-23T12:24:36Z

model/driver/src/icon4py/model/driver/initialization_utils.py

+    RD_O_CPD,
+)
+from icon4py.model.common.decomposition.definitions import DecompositionInfo, ProcessProperties
+from icon4py.model.common.decomposition.mpi_decomposition import ParallelLogger


This import forces the user to have mpi4py installed. We tried to have the entire code run (of course only for single node) even without mpi4py in the environment. That is why there are these single_dispatch functions in mdecomposition/definitions.py I realize that there might be a single_dispatch missing for the logger.

I have not really gone far to understand your logging system and decomposition. So, I add a TODO there when the single_dispatch functionality is ready.

model/driver/src/icon4py/model/driver/initialization_utils.py

halungge · 2024-04-23T12:39:06Z

model/driver/src/icon4py/model/driver/testcase_functions.py

+
+
+# TODO (Chia Rui): Construct a proper test for these diagnostic stencils?
+def diagnose_temperature_numpy(


you could easily make this a gt4py stencil...

Nice idea. I will port the temperature and pressure diagnosis to gt4py. They can be used when users want to output variables in the future.

halungge · 2024-04-23T12:42:38Z

model/driver/src/icon4py/model/driver/testcase_functions.py

+    return p_u_out, p_v_out
+
+
+def interpolation_cells2edges_scalar_numpy(


can you replace that with a call to horizontal.py::cell_2_edge_interpolation` ? It should do the same thing.

I tend to keep this numpy version here because I want all computations during initialization to be consistent in one format, instead of some parts of the initialization process being gt4py stencil and the rest being numpy/cupy. Moreover, some of the computations in mode initialization are only used once. So, I think writing them all in numpy/cupy is enough. I move cell_2_edge_interpolation stencil to interpolation folder.

halungge · 2024-04-23T12:47:18Z

model/driver/src/icon4py/model/driver/testcase_functions.py

+from icon4py.model.common.grid.icon import IconGrid
+
+
+def interpolation_rbf_edges2cells_vector_numpy(


which one is this in icon? Can we port it to gt4py?

Yes. It is bf_vec_interpol_cell in mo_intp_rbf.f90. I will create gt4py version of this stencil in interpolation folder.

I have removed this numpy version and use the gt4py version which I put it interpolation/stencils/edge_2_cell_vector_rbf_interpolation.py.

model/driver/src/icon4py/model/driver/testcase_functions.py

… except pressure

…stic_calculations

OngChia · 2024-05-03T09:47:22Z

cscs-ci run default

halungge · 2024-05-03T07:06:54Z

model/common/src/icon4py/model/common/constants.py

@@ -58,6 +61,12 @@
 DELTA_TEMPERATURE: Final[wpfloat] = 75.0
 DEL_T_BG: Final[wpfloat] = DELTA_TEMPERATURE

+#: Earth average radius [m]


I think I added this in PR 428 Can you check for duplication?

Yes. I confirm that it is duplicated. I deleted my one.

model/common/src/icon4py/model/common/grid/simple.py

halungge · 2024-05-03T07:19:06Z

model/common/src/icon4py/model/common/grid/simple.py

+            [22, 23, 3, 4, 5, 12, 7, 8, 15],
+            [25, 26, 6, 7, 8, 15, 1, 2, 9],
+            [0, 1, 5, 6, 7, 2, 9, 10, 14],
+            [3, 4, 8, 0, 1, 5, 12, 13, 17],  # 5c


Suggested change

[3, 4, 8, 0, 1, 5, 12, 13, 17], # 5c

[3, 4, 8, 0, 1, 5, 12, 13, 17], # 4c

halungge · 2024-05-03T07:21:15Z

model/common/src/icon4py/model/common/grid/simple.py

+            [1, 2, 9, 10, 11, 18, 13, 14, 21],
+            [4, 5, 12, 13, 14, 21, 16, 17, 24],
+            [7, 8, 15, 16, 17, 24, 10, 11, 18],
+            [9, 10, 14, 15, 16, 11, 18, 19, 23],  # 10c


Suggested change

[9, 10, 14, 15, 16, 11, 18, 19, 23], # 10c

[9, 10, 14, 15, 16, 11, 18, 19, 23], # 9c

model/common/src/icon4py/model/common/grid/simple.py

model/common/src/icon4py/model/common/grid/horizontal.py

model/common/tests/diagnostic_calculations_tests/test_diagnostic_calculations.py

halungge · 2024-05-03T08:51:23Z

model/common/tests/diagnostic_calculations_tests/test_diagnostic_calculations.py

+        offset_provider={"Koff": KDim},
+    )
+
+    # TODO (Chia Rui): remember to uncomment this computation when the bug in gt4py is removed


Is this TODO obsolete? Computation is not commented....

Ahh. Yes, it is obsolete. I forgot to delete it.

model/common/tests/diagnostic_calculations_tests/test_diagnostic_calculations.py

model/driver/src/icon4py/model/driver/testcase_functions.py

…abw data is available for CI

OngChia · 2024-05-03T14:03:24Z

cscs-ci run default

OngChia · 2024-05-03T14:03:42Z

launch jenkins spack

github-actions · 2024-05-03T17:22:53Z

Mandatory Tests

Please make sure you run these tests via comment before you merge!

cscs-ci run default
launch jenkins spack

Optional Tests

To run benchmarks you can use:

cscs-ci run benchmark

To run tests and benchmarks with the DaCe backend you can use:

cscs-ci run dace

In case your change might affect downstream icon-exclaim, please consider running

launch jenkins icon

For more detailed information please look at CI in the EXCLAIM universe.

OngChia · 2024-05-03T17:23:34Z

cscs-ci run default

OngChia · 2024-05-03T17:23:41Z

launch jenkins spack

halungge · 2024-05-03T17:48:05Z

model/common/src/icon4py/model/common/diagnostic_calculations/stencils/diagnose_pressure.py

+    pressure = (
+        sqrt(pressure_sfc * pressure_interface) if state[2] else sqrt(state[1] * pressure_interface)
+    )
+    return pressure, pressure_interface, False


there is a is_roundtrip function for that just in case.

OngChia · 2024-05-06T08:13:14Z

Thanks. I have already used is_roundtrip to skip the test when backend is roundtrip.

OngChia added 15 commits April 15, 2024 10:06

Pull changes for initial conditions from Jablonowski_Williamson_test …

49e165a

…branch.

Changes function names testcase_functions.py for better readability.

7c20ea6

Added initial conditions for JW.

6e02762

Add back io_utils which later will become initialization_utils.py

7a900f7

remove existing initialization

8242587

rename io_utils.py as initialization_utils.py

4951b81

Add JW initial conditions in initialization_utils.py. Move non-compul…

17e1d51

…sory test for JW initial condition to test_testcase.py. Fixed a few bugs.

Removed unecessary savepoints.

8be6e12

clean up. Remove unecessary codes that were used to output data for C…

92c3db0

…DO remap.

precommit

994b32e

Merge branch 'main' into initial_condition_for_JW_test

33abcd2

merge main

37725c1

Remove dummy log file that was accidentally added

9445dd5

Removed unwanted diagnostic metric state variables that were used to …

9ac856c

…output the grid data for remapping.

merge main

ebd03db

OngChia requested a review from halungge April 23, 2024 08:38

halungge reviewed Apr 23, 2024

View reviewed changes

OngChia added 9 commits April 26, 2024 13:38

add docstring to variables in horizontal.py

617b312

move referecen solution to second argument in allclose.

b092957

create diagnostic_stencils and their tests

ccc4b05

merge main

b44895d

Finalizing all stencil and data tests for diagnostic state variables,…

b9a3061

… except pressure

Removed init_exner_pr and temporary printing statement in test_diagno…

3342960

…stic_calculations

remove comment

b557e1c

remove unsued rbf numpy stencil in testcase_functions.py

21eb5a0

remove bug in pressure stencil test

53a0d6c

OngChia requested a review from halungge May 2, 2024 11:30

Resolved pressure problem

00ce346

halungge requested changes May 3, 2024

View reviewed changes

OngChia added 3 commits May 3, 2024 15:46

changes according to review

4d16b5d

remove the pytest skip mark for test_jabw_initial_condition because j…

9fdc961

…abw data is available for CI

merge main

d3e1d7a

OngChia requested a review from halungge May 3, 2024 14:06

skip test_diagnose_pressure when roundtrip backend

1908c52

halungge approved these changes May 3, 2024

View reviewed changes

OngChia merged commit dd3d9d4 into main May 6, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial condition for jw test #446

Initial condition for jw test #446

OngChia commented Apr 18, 2024

halungge Apr 23, 2024

OngChia May 2, 2024

halungge Apr 23, 2024

OngChia May 2, 2024

halungge Apr 23, 2024

OngChia Apr 30, 2024

halungge Apr 23, 2024

OngChia Apr 30, 2024

halungge Apr 23, 2024

OngChia Apr 30, 2024

OngChia May 2, 2024

OngChia commented May 3, 2024

halungge May 3, 2024

OngChia May 3, 2024

halungge May 3, 2024

halungge May 3, 2024

halungge May 3, 2024

OngChia May 3, 2024

OngChia commented May 3, 2024

OngChia commented May 3, 2024

github-actions bot commented May 3, 2024

OngChia commented May 3, 2024

OngChia commented May 3, 2024

halungge May 3, 2024

OngChia commented May 6, 2024



		# TODO (Chia Rui): Construct a proper test for these diagnostic stencils?
		def diagnose_temperature_numpy(

		return p_u_out, p_v_out


		def interpolation_cells2edges_scalar_numpy(

		from icon4py.model.common.grid.icon import IconGrid


		def interpolation_rbf_edges2cells_vector_numpy(

	[3, 4, 8, 0, 1, 5, 12, 13, 17], # 5c
	[3, 4, 8, 0, 1, 5, 12, 13, 17], # 4c

	[9, 10, 14, 15, 16, 11, 18, 19, 23], # 10c
	[9, 10, 14, 15, 16, 11, 18, 19, 23], # 9c

Initial condition for jw test #446

Initial condition for jw test #446

Conversation

OngChia commented Apr 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OngChia commented May 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OngChia commented May 3, 2024

OngChia commented May 3, 2024

github-actions bot commented May 3, 2024

OngChia commented May 3, 2024

OngChia commented May 3, 2024

Choose a reason for hiding this comment

OngChia commented May 6, 2024