Adjust store directives, so that it compiles with MITgcm PR862 without any intervention #26
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| #include "IHOP_OPTIONS.h" | ||
| #ifdef ALLOW_AUTODIFF | ||
| # include "AUTODIFF_OPTIONS.h" | ||
| #endif | ||
| !BOP | ||
| ! !ROUTINE: IHOP | ||
| ! !INTERFACE: | ||
|
|
@@ -59,10 +62,16 @@ SUBROUTINE IHOP_MAIN ( myTime, myIter, myThid ) | |
| USE ihop_init_diag, only: initPRTFile, openOutputFiles, resetMemory | ||
| USE bdry_mod, only: Bdry, writeBdry | ||
| USE ssp_mod, only: setSSP | ||
| #ifdef ALLOW_AUTODIFF_TAMC | ||
| USE ssp_mod, only: SSP | ||
| #endif | ||
| USE refCoef, only: writeRefCoef | ||
| USE beampat, only: writePat | ||
| USE ihop_mod, only: Beam | ||
|
|
||
| #ifdef ALLOW_AUTODIFF | ||
| # include "tamc.h" | ||
| #endif | ||
| ! == Routine Arguments == | ||
| ! myThid :: Thread number. Unused by IESCO | ||
| ! msgBuf :: Used to build messages for printing. | ||
|
|
@@ -91,16 +100,19 @@ SUBROUTINE IHOP_MAIN ( myTime, myIter, myThid ) | |
| CALL writeBdry ( myThid ) | ||
|
|
||
| ! write refCoef: OPTIONAL | ||
| CALL writeRefCoef( myThid ) | ||
|
|
||
| ! Source Beam Pattern: OPTIONAL, default is omni source pattern | ||
| CALL writePat( myThid ) | ||
|
|
||
|
|
||
| ! set SSP%cmat from gcm SSP: REQUIRED | ||
| #ifdef ALLOW_AUTODIFF_TAMC | ||
| !$TAF STORE ssp%c, ssp%cz = comlev1_ihop, key = ikey_dynamics | ||
| !$TAF STORE ssp%czmat, ssp%rho = comlev1_ihop, key = ikey_dynamics | ||
| #endif | ||
| CALL setSSP( myThid ) | ||
|
|
||
| ! open all output files | ||
| IF ( IHOP_dumpfreq .GE. 0 ) & | ||
| CALL OpenOutputFiles( IHOP_fileroot, myTime, myIter, myThid ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,10 +86,6 @@ SUBROUTINE IHOP_COST_INLOOP( myTime, myThid ) | |
| & .AND.(ihopObs_time(num_file,m,bi,bj).LT. | ||
| & (myTime+deltaTclock))) THEN | ||
|
|
||
| ihop_modval=0 | ||
|
|
||
| CALL ihop_cost_modval(ihop_modval, num_file, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| #include "IHOP_OPTIONS.h" | ||
| #ifdef ALLOW_AUTODIFF | ||
| # include "AUTODIFF_OPTIONS.h" | ||
| #endif | ||
|
|
||
| CBOP | ||
| C !ROUTINE: IHOP_DRIVER | ||
|
|
@@ -11,6 +14,14 @@ SUBROUTINE IHOP_DRIVER( myTime, myIter, myThid ) | |
|
|
||
| C !FORTRAN90 USE MODULES: =============================================== | ||
| USE ihop, only: ihop_main | ||
| #ifdef ALLOW_AUTODIFF_TAMC | ||
| USE arr_mod, only: arr | ||
| USE bdry_mod, only: bdry | ||
| USE ssp_mod, only: ssp | ||
| USE srpos_mod, only: pos | ||
| use angle_mod, only: angles | ||
| use ihop_mod, only: beam, ray2d | ||
| #endif | ||
|
|
||
| IMPLICIT NONE | ||
| C !GLOBAL VARIABLES: =============================================== | ||
|
|
@@ -24,6 +35,9 @@ SUBROUTINE IHOP_DRIVER( myTime, myIter, myThid ) | |
| # include "IHOP_SIZE.h" | ||
| # include "IHOP.h" | ||
| #endif /* ALLOW_IHOP */ | ||
| #ifdef ALLOW_AUTODIFF_TAMC | ||
| # include "tamc.h" | ||
| #endif | ||
|
|
||
| C !INPUT PARAMETERS: =================================================== | ||
| C myTime :: Current time in simulation | ||
|
|
@@ -36,10 +50,23 @@ SUBROUTINE IHOP_DRIVER( myTime, myIter, myThid ) | |
|
|
||
| C !LOCAL VARIABLES: ==================================================== | ||
| INTEGER t | ||
| #ifdef ALLOW_AUTODIFF_TAMC | ||
| integer tkey | ||
| #endif | ||
|
|
||
| CEOP | ||
|
|
||
| #ifdef ALLOW_IHOP | ||
| DO t=1,nts | ||
| CML# ifdef ALLOW_AUTODIFF_TAMC | ||
| CML tkey = nts*(ikey_dynamics-1) + t | ||
| CML!$TAF STORE arr, bdry, ray2d = comlev1_ihop_nts, key = tkey | ||
| CML!$TAF STORE angles%dalpha = comlev1_ihop_nts, key = tkey | ||
| CML!$TAF STORE bdry%bot, bdry%top = comlev1_ihop_nts, key = tkey | ||
| CML!$TAF STORE beam%nsteps = comlev1_ihop_nts, key = tkey | ||
| CML!$TAF STORE pos%rz, pos%sz = comlev1_ihop_nts, key = tkey | ||
| CML!$TAF STORE ssp%c = comlev1_ihop_nts, key = tkey | ||
| CML# endif | ||
|
||
| IF ( IHOP_iter(t).GE.0 ) THEN | ||
| IF ( IHOP_iter(t).EQ.myIter ) THEN | ||
| CALL IHOP_MAIN( myTime, myIter, myThid ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,7 +79,9 @@ SUBROUTINE CSPLINE (TAU, C, N, IBCBEG, IBCEND, NDIM) | |
|
|
||
| L = N - 1 | ||
|
|
||
| !$TAF init cspline1 = static, 1 | ||
| !$TAF init cspline1_ndim = static, NDIM | ||
| !ML!$TAF init cspline1 = static, 4*NDIM*L ! not sure if this correct | ||
|
|
||
| DO M = 2,N | ||
| C(3,M) = TAU(M) - TAU(M-1) | ||
|
|
@@ -88,7 +90,7 @@ SUBROUTINE CSPLINE (TAU, C, N, IBCBEG, IBCEND, NDIM) | |
|
|
||
| ! * BEGINNING BOUNDARY CONDITION SECTION * | ||
|
|
||
| !$TAF INCOMPLETE C | ||
| IF (IBCBEG==0) THEN ! IBCBEG = 0 | ||
| !$TAF store C = cspline1 | ||
| IF (N.GT.2) THEN ! N > 2 | ||
|
|
@@ -120,18 +122,21 @@ SUBROUTINE CSPLINE (TAU, C, N, IBCBEG, IBCEND, NDIM) | |
|
|
||
| ! * RUNNING CALCULATIONS TO N-1 - LOOP IS NOT EXECUTED IF N = 2 * | ||
|
|
||
| !$TAF store C = cspline1 | ||
| DO M = 2,L | ||
| !$TAF store C = cspline1_ndim, key = M | ||
| G = -C(3,M+1) / C(4,M-1) | ||
| C(2,M) = G*C(2,M-1) + 3.0*(C(3,M)*C(4,M+1) + C(3,M+1)*C(4,M)) | ||
| C(4,M) = G*C(3,M-1) + 2.0*(C(3,M) + C(3,M+1)) | ||
| END DO | ||
|
|
||
| ! * ENDING BOUNDARY CONDITION SECTION * | ||
|
|
||
| !$TAF INCOMPLETE C | ||
| IF (IBCEND /= 1) THEN | ||
| !$TAF store C = cspline1 | ||
| IF (IBCEND==0) THEN | ||
| !$TAF INCOMPLETE C | ||
| IF (N==2 .AND. IBCBEG==0) THEN | ||
| C(2,N) = C(4,N) | ||
| ELSE IF ((N==3 .AND. IBCBEG==0) .OR. N==2) THEN | ||
|
|
@@ -154,17 +159,18 @@ SUBROUTINE CSPLINE (TAU, C, N, IBCBEG, IBCEND, NDIM) | |
| G = -1.0 / C(4,N-1) | ||
| ELSE | ||
| ! do nothing | ||
| C(2,N) = C(2,N) | ||
| C(4,N) = C(4,N) | ||
| G = G | ||
| ENDIF | ||
|
|
||
| IF ( IBCBEG.GT.0 .OR. N.GT.2) THEN | ||
| !$TAF store C = cspline1 | ||
| C(4,N) = G*C(3,N-1) + C(4,N) | ||
| C(2,N) = (G*C(2,N-1) + C(2,N)) / C(4,N) | ||
| END IF | ||
| END IF | ||
| !$TAF store C = cspline1 | ||
|
|
||
| ! * RUN THE ENDING BOUNDARY EFFECT BACK THROUGH THE EQUATIONS * | ||
|
|
||
|
|
@@ -194,7 +200,7 @@ SUBROUTINE CSPLINE (TAU, C, N, IBCBEG, IBCEND, NDIM) | |
|
|
||
| C(4,N) = (0.0,0.0) | ||
| DO I = 1,L ! INTEGRATE OVER THE INTERVAL | ||
| !$TAF store C = cspline1_ndim, key = I | ||
| DTAU = TAU(I+1) - TAU(I) | ||
| C(4,N) = C(4,N) + DTAU*(C(1,I) + DTAU*(C(2,I)/2.0 + & | ||
| DTAU*(C(3,I)/6.0 + DTAU*C(4,I)/24.0))) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this could be done in a similar way for tapelevel3 and tapelevel4.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use the PASSIVE statement does not work properly