<p><b>mhoffman@lanl.gov</b> 2012-05-11 15:26:05 -0600 (Fri, 11 May 2012)</p><p>BRANCH COMMIT -- land ice<br>
<br>
Minor changes needed to compile land ice core on Jaguar.<br>
(use: make pgi-jaguar CORE=land_ice)<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice_projects/implement_core/Makefile
===================================================================
--- branches/land_ice_projects/implement_core/Makefile        2012-05-11 21:06:29 UTC (rev 1900)
+++ branches/land_ice_projects/implement_core/Makefile        2012-05-11 21:26:05 UTC (rev 1901)
@@ -94,6 +94,21 @@
        "USE_PAPI = $(USE_PAPI)" \
        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+pgi-jaguar:
+        ( $(MAKE) all \
+        "FC_PARALLEL = ftn" \
+        "CC_PARALLEL = cc" \
+        "FC_SERIAL = ftn" \
+        "CC_SERIAL = gcc" \
+        "FFLAGS_OPT = -Mfree -r8 -O2 -byteswapio" \
+        "CFLAGS_OPT = -O3" \
+        "LDFLAGS_OPT = -O3" \
+        "CORE = $(CORE)" \
+        "DEBUG = $(DEBUG)" \
+        "SERIAL = $(SERIAL)" \
+        "USE_PAPI = $(USE_PAPI)" \
+        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
ifort:
        ( $(MAKE) all \
        "FC_PARALLEL = mpif90" \
Modified: branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F        2012-05-11 21:06:29 UTC (rev 1900)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_tendency.F        2012-05-11 21:26:05 UTC (rev 1901)
@@ -213,9 +213,11 @@
end do
- !\todo Calculate h_edge that can be used by SIA solve and FO advection scheme. ocn_diagnostic_solve in mpas_ocn_tendency.F has 2, 3, & 4th order calculations for h_edge that can be used. Right now I am using 2nd order h_edge in SIA solve and 1st order h_edge in FO advection.
+ ! \todo Calculate h_edge that can be used by SIA solve and FO advection scheme.
+ ! ocn_diagnostic_solve in mpas_ocn_tendency.F has 2, 3, & 4th order calculations for h_edge that can be used.
+ ! Right now I am using 2nd order h_edge in SIA solve and 1st order h_edge in FO advection.
-!!!!!!!!!!!!!!!!!! !\todo Calculate masks. Right now sia driver and Forward Euler time integration have need of a mask and both do it on their own. We need to define how the masks should work and implement them here.
+ ! Calculate masks
call land_ice_calculate_mask(mesh, state, err)
</font>
</pre>