Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 27, 2012
@xyan075 xyan075 Interface coordinate system
Interface now has its own coordinate system attached and we no longer use its parent region's coordinate system, when getting the coordinate system for the field in the interface

Tracker item: 3118
87b3707
Commits on Apr 14, 2012
@chrispbradley chrispbradley Merge pull request #89 from xyan075/master
Interface coordinate system
67b2fde
Showing with 5 additions and 14 deletions.
  1. +5 −14 src/field_routines.f90
View
19 src/field_routines.f90
@@ -2824,7 +2824,7 @@ SUBROUTINE FIELD_COORDINATE_SYSTEM_GET(FIELD,COORDINATE_SYSTEM,ERR,ERROR,*)
TYPE(VARYING_STRING), INTENT(OUT) :: ERROR !<The error string
!Local Variables
TYPE(INTERFACE_TYPE), POINTER :: INTERFACE
- TYPE(REGION_TYPE), POINTER :: REGION,PARENT_REGION
+ TYPE(REGION_TYPE), POINTER :: REGION
TYPE(VARYING_STRING) :: LOCAL_ERROR
CALL ENTERS("FIELD_COORDINATE_SYSTEM_GET",ERR,ERROR,*999)
@@ -2847,22 +2847,13 @@ SUBROUTINE FIELD_COORDINATE_SYSTEM_GET(FIELD,COORDINATE_SYSTEM,ERR,ERROR,*)
ELSE
INTERFACE=>FIELD%INTERFACE
IF(ASSOCIATED(INTERFACE)) THEN
- PARENT_REGION=>INTERFACE%PARENT_REGION
- IF(ASSOCIATED(PARENT_REGION)) THEN
- COORDINATE_SYSTEM=>PARENT_REGION%COORDINATE_SYSTEM
- IF(.NOT.ASSOCIATED(COORDINATE_SYSTEM)) THEN
- LOCAL_ERROR="The coordinate system is not associated for field number "// &
- & TRIM(NUMBER_TO_VSTRING(FIELD%USER_NUMBER,"*",ERR,ERROR))//" of interface number "// &
- & TRIM(NUMBER_TO_VSTRING(INTERFACE%USER_NUMBER,"*",ERR,ERROR))//" of parent region number "// &
- & TRIM(NUMBER_TO_VSTRING(PARENT_REGION%USER_NUMBER,"*",ERR,ERROR))//"."
- CALL FLAG_ERROR(LOCAL_ERROR,ERR,ERROR,*999)
- ENDIF
- ELSE
- LOCAL_ERROR="The parent region not associated for field number "// &
+ COORDINATE_SYSTEM=>INTERFACE%COORDINATE_SYSTEM
+ IF(.NOT.ASSOCIATED(COORDINATE_SYSTEM)) THEN
+ LOCAL_ERROR="The coordinate system is not associated for field number "// &
& TRIM(NUMBER_TO_VSTRING(FIELD%USER_NUMBER,"*",ERR,ERROR))//" of interface number "// &
& TRIM(NUMBER_TO_VSTRING(INTERFACE%USER_NUMBER,"*",ERR,ERROR))//"."
CALL FLAG_ERROR(LOCAL_ERROR,ERR,ERROR,*999)
- ENDIF
+ ENDIF
ELSE
LOCAL_ERROR="The region or interface is not associated for field number "// &
& TRIM(NUMBER_TO_VSTRING(FIELD%USER_NUMBER,"*",ERR,ERROR))//"."

No commit comments for this range

Something went wrong with that request. Please try again.