Skip to content
This repository has been archived by the owner on Oct 23, 2020. It is now read-only.

cleaned up white space #1

Merged
merged 5 commits into from
May 2, 2013
Merged

Conversation

toddringler
Copy link
Contributor

request to clean up white space in src/core_ocean/Makefile

I sent this by email, but am trying it here too:
in reviewing toddringler-ocean/CVMix

make clean CORE=ocean

produces an error:
make[2]: Entering directory /usr/projects/climate/mpeterse/mpas_git/MPAS/src/core_ocean' (test -d cvmix && (cd cvmix; make clean) ) make[2]: *** [clean] Error 1 make[2]: Leaving directory/usr/projects/climate/mpeterse/mpas_git/MPAS/src/core_ocean'
make[1]: *** [clean] Error 2
make[1]: Leaving directory `/usr/projects/climate/mpeterse/mpas_git/MPAS/src'
make: *** [clean] Error 2

perhaps test is working a different way in c-shell?

My global KE is also off by a factor of two between toddringler-ocean/CVMix and the develop branch. Not sure why yet. Maybe I did something funny checking out Todd's branch.

Mark

@ghost ghost assigned douglasjacobsen Apr 23, 2013
Also adding a .gitignore file to ignore the entire CVMix project.
@douglasjacobsen
Copy link
Member

We should add something so that when we do a make clean CORE=ocean it removes the cvmix directory.

@toddringler toddringler reopened this Apr 25, 2013
Now src/core_ocean/Makefile checks to see if cvmix exists before doing
a `svn checkout`. If it does exist, the checkout is skipped.

When make cd's into cvmix, a `svn update` is done as well.

When cleaning, if cvmix exists `make clean` is called from inside cvmix.
@ghost ghost assigned mark-petersen Apr 29, 2013
@mark-petersen
Copy link
Contributor

Todd, download this file:
https://gist.github.com/douglasjacobsen/90f425b518de39056527
and copy it to src/core_ocean/Makefile
in your branch. This version avoids a make error on lobo.

@mark-petersen mark-petersen merged commit cf5da4d into MPAS-Dev:develop May 2, 2013
@toddringler toddringler deleted the ocean/CVMix branch May 2, 2013 21:22
akturner added a commit that referenced this pull request Oct 29, 2015
toddringler pushed a commit that referenced this pull request Dec 1, 2015
Fixes warning message of type

Image              PC                Routine            Line        Source
ocean_model        0000000001DDDBE6  Unknown               Unknown  Unknown
ocean_model        00000000012963EA  ocn_lagrangian_pa        1426  mpas_ocn_lagrangian_particle_tracking.F
ocean_model        000000000127CDEC  ocn_lagrangian_pa         187  mpas_ocn_lagrangian_particle_tracking.F
ocean_model        00000000010A371A  ocn_analysis_driv         948  mpas_ocn_analysis_driver.F
ocean_model        000000000109C72A  ocn_analysis_driv         405  mpas_ocn_analysis_driver.F
ocean_model        0000000000C21EA7  ocn_forward_mode_         325  mpas_ocn_forward_mode.F
ocean_model        00000000010A982A  ocn_core_mp_ocn_c          79  mpas_ocn_core.F
ocean_model        00000000004051B9  mpas_subdriver_mp         307  mpas_subdriver.F
ocean_model        00000000004012F8  MAIN__                     14  mpas.F
ocean_model        000000000040128E  Unknown               Unknown  Unknown
ocean_model        0000000001EABDB1  Unknown               Unknown  Unknown
ocean_model        0000000000401175  Unknown               Unknown  Unknown
forrtl: warning (406): fort: (1): In call to MPAS_TRIANGLE_SIGNED_AREA, an array temporary was created for argument #1
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants