Skip to content

Commit

Permalink
Compile FMS with -DGFS_PHYS flag (#29)
Browse files Browse the repository at this point in the history
Since we are compiling everything in FV3/ with the -DGFS_PHYS flag, we should do the same for FMS. This changes the physical constants the model uses (and make the constants consistent with assumptions made by coarsening procedures in fv3net).
  • Loading branch information
Oliver Watt-Meyer authored Apr 22, 2020
1 parent 0e240ab commit 42f2877
Show file tree
Hide file tree
Showing 5 changed files with 2,069 additions and 2,069 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ENV CC=mpicc
ENV FC=mpifort
ENV LDFLAGS="-L/usr/lib"
ENV LOG_DRIVER_FLAGS="--comments"
ENV CPPFLAGS="-I/usr/include -Duse_LARGEFILE -DMAXFIELDMETHODS_=500"
ENV CPPFLAGS="-I/usr/include -Duse_LARGEFILE -DMAXFIELDMETHODS_=500 -DGFS_PHYS"
ENV FCFLAGS="-fcray-pointer -Waliasing -ffree-line-length-none -fno-range-check -fdefault-real-8 -fdefault-double-8 -fopenmp"

COPY FMS /FMS
Expand Down
96 changes: 48 additions & 48 deletions tests/pytest/reference/circleci/default/md5.txt
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
4392420331b21ebaf88587df36d491dc atmos_8xdaily.tile1.nc
78416cf1d149634174f267e398fcc062 atmos_8xdaily.tile2.nc
12b520727737f23134da02c9b9a85581 atmos_8xdaily.tile3.nc
d5261bfb6f306286b58971b7cb756cec atmos_8xdaily.tile4.nc
8e44e97c647831c37d2bec8413df46db atmos_8xdaily.tile5.nc
81b7015fe51d981e71399c78e49a15d3 atmos_8xdaily.tile6.nc
dc415787343cc61e6c1fae56a410c8f0 atmos_dt_atmos.tile1.nc
757b03f590294074c3d94091a529473d atmos_dt_atmos.tile2.nc
de234af011442b32a51ad9be131ece6d atmos_dt_atmos.tile3.nc
14fd6bb632f8fedb108413c1963a07b6 atmos_dt_atmos.tile4.nc
079812911a8e3010748deb0e4f71fc97 atmos_dt_atmos.tile5.nc
3cd80944855424a39a98fae36d33f072 atmos_dt_atmos.tile6.nc
cf20eac67f2a214d757762b11bd34632 atmos_8xdaily.tile1.nc
534581bd30c07e9d477898500346dbd6 atmos_8xdaily.tile2.nc
8173f3b63ccd4e362df00759f2b127f1 atmos_8xdaily.tile3.nc
83a89d10bb34bc2668bf0d56e34e2fc6 atmos_8xdaily.tile4.nc
2024cd0bedf011b9e492ddf164da2bbb atmos_8xdaily.tile5.nc
cf70b809e39ecee7d67510fca74f8ab7 atmos_8xdaily.tile6.nc
b2ac0c8c3a7a8e2cca9bd6b254da910e atmos_dt_atmos.tile1.nc
dca4365cb4f542b24f9dcd6de261fd12 atmos_dt_atmos.tile2.nc
76d8efd24dd179e257049665523388aa atmos_dt_atmos.tile3.nc
37049aa77eaff65825a64b1de99e83e3 atmos_dt_atmos.tile4.nc
2b11382c13a768aecdd123f572db1901 atmos_dt_atmos.tile5.nc
895656fd7b9a52ed2602c014ac467c7b atmos_dt_atmos.tile6.nc
8eb161a8cd002f6b4d22153b2f70d1e9 atmos_static.tile1.nc
ef1e925dfc78367952c956bdb7e1ceb4 atmos_static.tile2.nc
8d896f1374d26641eb88ee448db35fef atmos_static.tile3.nc
2ffd7708edd11a7f5b4d986237ef128b atmos_static.tile4.nc
69767c62e6861db5fc20ce34cda3d383 atmos_static.tile5.nc
2e112b68717697f780843d8a3a48e2cd atmos_static.tile6.nc
299bc49bccc564f48ca4ca640d96d273 sfc_dt_atmos.tile1.nc
729239bd350aa919155bbd8dcac4c966 sfc_dt_atmos.tile2.nc
7a93effb35f4b77fe7c08024f32627f9 sfc_dt_atmos.tile3.nc
c4df47db2b3c1a3dac41cb4d89244ca8 sfc_dt_atmos.tile4.nc
10840619595cad2408953862396db11f sfc_dt_atmos.tile5.nc
8e9c5f0e9a664dfc1c5c0ced40c2f588 sfc_dt_atmos.tile6.nc
398d39f61c18d20b929637aefa9b54cc sfc_dt_atmos.tile1.nc
3a6fa953c624b2997fcc3f07bbf9150b sfc_dt_atmos.tile2.nc
a931dad19e4d77f93c57438b797a9253 sfc_dt_atmos.tile3.nc
0b6f5c4a2b31fedcd7fe507013c38493 sfc_dt_atmos.tile4.nc
a46c29ad065f72915e04aa32053bd302 sfc_dt_atmos.tile5.nc
e3ab1dbc5fb5e6205ea2c0e677ce8bf6 sfc_dt_atmos.tile6.nc
03f92921ec61bc2e8650bcc3b1cc3971 RESTART/fv_core.res.nc
5aaa2dd261974b38c8addca8def60d1c RESTART/fv_core.res.tile1.nc
f7a67b6bd7d524b5262104bedcdb4f19 RESTART/fv_core.res.tile2.nc
1536df96037be4820072cc97df2b3724 RESTART/fv_core.res.tile3.nc
ba004f8e993e47030cca2c3ce049e2da RESTART/fv_core.res.tile4.nc
4ec5b44f3be89a6339cdc940b46e1a70 RESTART/fv_core.res.tile5.nc
90e27e06460b9470feb04d326f591d4c RESTART/fv_core.res.tile6.nc
e8e157427a666ffd072c60defcab6739 RESTART/fv_srf_wnd.res.tile1.nc
aab9cf83a48955aa7ab550a60d18e12b RESTART/fv_srf_wnd.res.tile2.nc
86ae92ccbafdef19388d1fa4ae299949 RESTART/fv_srf_wnd.res.tile3.nc
5fd74ae796e73fcce03326ea6244048f RESTART/fv_srf_wnd.res.tile4.nc
5618fa1cbf1e010cb279f6334730cb99 RESTART/fv_srf_wnd.res.tile5.nc
4a33fd4c7f8a61f7d221983be27ea327 RESTART/fv_srf_wnd.res.tile6.nc
9dbc067917d5a7af2aa08d302a5fbb36 RESTART/fv_tracer.res.tile1.nc
b2bbd1d1cfab209e8ae4a2f4b447641a RESTART/fv_tracer.res.tile2.nc
8a0fb2d86cb80ec5c2f7c85b885174ef RESTART/fv_tracer.res.tile3.nc
6c5949b5c4257b0330f0a7635b9d17b4 RESTART/fv_tracer.res.tile4.nc
41d95dda958741bbaff3dfda96401627 RESTART/fv_tracer.res.tile5.nc
5add012227d4b82d31f96cd0e112808c RESTART/fv_tracer.res.tile6.nc
b6430cee19862a51e381828b00e6877e RESTART/phy_data.tile1.nc
d02c5fdd9b34f4669b4b4467b1d9b01a RESTART/phy_data.tile2.nc
b39626ca384b586d602b8bdb049ab47d RESTART/phy_data.tile3.nc
5edae36ec7d0718b5ddaa2726269144c RESTART/phy_data.tile4.nc
08bc64ba4adb898da72f373fb9ce33c5 RESTART/phy_data.tile5.nc
361e024da0a97fcc375d0cb2cd0da468 RESTART/phy_data.tile6.nc
2e310a50d066b32edc084871871a986c RESTART/sfc_data.tile1.nc
213bc4e274bc7765f873ed793d699d01 RESTART/sfc_data.tile2.nc
8a422ec242a8b231b862a36c502e1e19 RESTART/sfc_data.tile3.nc
06e820ebd5b21d12ca93fb6825da3b8e RESTART/sfc_data.tile4.nc
09430cf9875d013a87e7cee229b80486 RESTART/sfc_data.tile5.nc
1e199b4fa024dcfd9ead44c6eff02ba6 RESTART/sfc_data.tile6.nc
9d4ffd9a262f3ef60de57d7a92fb0dd0 RESTART/fv_core.res.tile1.nc
186f5baa8b81b1fb1277d966faba579d RESTART/fv_core.res.tile2.nc
4f74f4accbfab45992ab265161a2a3be RESTART/fv_core.res.tile3.nc
8ec9c38612c83c90e71a25bafed1e5e3 RESTART/fv_core.res.tile4.nc
7c98351547c6d7e829deafc87a353f76 RESTART/fv_core.res.tile5.nc
f4a6a2e4df1c696dd279af9cf449f436 RESTART/fv_core.res.tile6.nc
92c9fa87c3d9b4bf5f821a0f69356382 RESTART/fv_srf_wnd.res.tile1.nc
39d368200f66504109efa2b1f5bbe889 RESTART/fv_srf_wnd.res.tile2.nc
90afb356f6d89810030fc14433982064 RESTART/fv_srf_wnd.res.tile3.nc
fb14a7ab198b561130288aaf89f8510b RESTART/fv_srf_wnd.res.tile4.nc
5866060210afecd3f726448bbffcf56c RESTART/fv_srf_wnd.res.tile5.nc
bc99b1e0eff1ecd7c7653d477c2f6bd2 RESTART/fv_srf_wnd.res.tile6.nc
9c59d598f32d016e63fbd7975f78178d RESTART/fv_tracer.res.tile1.nc
610e531260548fe280e3ce9368ec440d RESTART/fv_tracer.res.tile2.nc
ab05dcd972d45c432272c5e524c7b486 RESTART/fv_tracer.res.tile3.nc
0365a7afebd2297be3b715a95a2d108b RESTART/fv_tracer.res.tile4.nc
270fd21ea0ab77e1c7b7613963f4712b RESTART/fv_tracer.res.tile5.nc
8d8fc5f4cdb81b8b90e57bf3eb2fb67c RESTART/fv_tracer.res.tile6.nc
8d14beed46b208acf47a3ad7939ef11a RESTART/phy_data.tile1.nc
2b646c13096be0029a332f6565fd6af1 RESTART/phy_data.tile2.nc
22291472aa90173066c3d354fcb2c6af RESTART/phy_data.tile3.nc
941c675e028e4cbefcfc9674fe2182fa RESTART/phy_data.tile4.nc
e6dee6daa03969007fad4d11562233ea RESTART/phy_data.tile5.nc
740744705355a0b42cc7a96554904b83 RESTART/phy_data.tile6.nc
fd49152e31366eaa1eb71cb1bf1d85e1 RESTART/sfc_data.tile1.nc
2becb873c842bee586cf5563bebe7a64 RESTART/sfc_data.tile2.nc
8d39e2a78632eccdc8bfc2d4e65533d1 RESTART/sfc_data.tile3.nc
c2c205126643dd8cfdd68d3739e0a3c2 RESTART/sfc_data.tile4.nc
4e343e2044da757b79ba636fdcad4692 RESTART/sfc_data.tile5.nc
b33d7b09f583b3c810d75efa89ec1800 RESTART/sfc_data.tile6.nc
Loading

0 comments on commit 42f2877

Please sign in to comment.