From 7df1e32cdf5d7cfd68588f25ad0c696f6a3effb4 Mon Sep 17 00:00:00 2001 From: sparonuz Date: Tue, 5 Nov 2019 15:58:50 +0100 Subject: [PATCH] Removed patch, since Issue#1 with UtilsRPE has been solved. --- Local/Files/release-4.0.1_r11711/dommsk.patch | 15 ----------- Local/Files/release-4.0.1_r11711/sbcrnf.patch | 11 -------- Local/Files/release-4.0.1_r11711/stpctl.patch | 27 +++---------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 Local/Files/release-4.0.1_r11711/dommsk.patch delete mode 100644 Local/Files/release-4.0.1_r11711/sbcrnf.patch diff --git a/Local/Files/release-4.0.1_r11711/dommsk.patch b/Local/Files/release-4.0.1_r11711/dommsk.patch deleted file mode 100644 index 57f7297..0000000 --- a/Local/Files/release-4.0.1_r11711/dommsk.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- dommsk.f90 2019-03-22 16:18:28.367941266 +0000 -+++ dommsk.f90_new 2019-03-22 16:22:27.559937959 +0000 -@@ -120,9 +120,9 @@ - wumask(:,:,jk) = umask(:,:,jk) * umask(:,:,jk-1) - wvmask(:,:,jk) = vmask(:,:,jk) * vmask(:,:,jk-1) - END DO -- ssmask (:,:) = MAXVAL( tmask(:,:,:), DIM=3 ) -- ssumask(:,:) = MAXVAL( umask(:,:,:), DIM=3 ) -- ssvmask(:,:) = MAXVAL( vmask(:,:,:), DIM=3 ) -+ ssmask (:,:) = MAXVAL( tmask(:,:,:)%val, DIM=3 ) -+ ssumask(:,:) = MAXVAL( umask(:,:,:)%val, DIM=3 ) -+ ssvmask(:,:) = MAXVAL( vmask(:,:,:)%val, DIM=3 ) - iif = nn_hls - iil = nlci - nn_hls + 1 - ijf = nn_hls diff --git a/Local/Files/release-4.0.1_r11711/sbcrnf.patch b/Local/Files/release-4.0.1_r11711/sbcrnf.patch deleted file mode 100644 index ec1bbc9..0000000 --- a/Local/Files/release-4.0.1_r11711/sbcrnf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sbcrnf.f90 2019-03-22 16:18:35.303941170 +0000 -+++ sbcrnf.f90_new 2019-03-22 16:23:03.979937455 +0000 -@@ -291,7 +291,7 @@ - CALL iom_get( inum, jpdom_data, TRIM( sn_rnf%clvar ), zrnfcl(:,:,2)%val , jm ) - zrnfcl(:,:,2)%sbits = emulator_variable_precisions(1889) - CALL apply_truncation(zrnfcl(:,:,2)) -- zrnfcl(:,:,1) = MAXVAL( zrnfcl(:,:,:), DIM=3 ) -+ zrnfcl(:,:,1) = MAXVAL( zrnfcl(:,:,:)%val, DIM=3 ) - END DO - CALL iom_close( inum ) - h_rnf(:,:) = 1. diff --git a/Local/Files/release-4.0.1_r11711/stpctl.patch b/Local/Files/release-4.0.1_r11711/stpctl.patch index d4b7347..df02fe1 100644 --- a/Local/Files/release-4.0.1_r11711/stpctl.patch +++ b/Local/Files/release-4.0.1_r11711/stpctl.patch @@ -1,6 +1,6 @@ ---- stpctl.f90 2019-03-22 10:25:27.842041000 +0100 -+++ stpctl.f90_new 2019-03-22 10:29:42.380830235 +0100 -@@ -102,20 +102,20 @@ +--- stpctl.f90 2019-11-05 14:43:27.007715267 +0100 ++++ stpctl_new.f90 2019-11-05 14:46:08.047594905 +0100 +@@ -104,15 +104,15 @@ ENDIF IF( ll_wrtruns ) THEN WRITE(numrun,9500) kt,real( zmax(1) ),real( zmax(2) ),real( -zmax(3) ),real( zmax(4) ) @@ -24,24 +24,3 @@ ENDIF IF( MOD( kt , 100 ) == 0 ) istatus = NF90_SYNC(idrun) IF( kt == nitend ) istatus = NF90_CLOSE(idrun) - END IF -- IF( ( ln_ctl .OR. lsomeoce ) .AND. ( zmax(1) > 20._wp .OR. zmax(2) > 10._wp .OR. zmax(3) >= 0._wp .OR. zmax(4) >= 100._wp .OR. zmax(4) < 0._wp .OR. ISNAN( zmax(1) + zmax(2) + zmax(3) ) ) ) THEN -+ IF( ( ln_ctl .OR. lsomeoce ) .AND. ( zmax(1) > 20._wp .OR. zmax(2) > 10._wp .OR. zmax(3) >= 0._wp .OR. zmax(4) >= 100._wp .OR. zmax(4) < 0._wp .OR. ISNAN( zmax(1)%val + zmax(2)%val + zmax(3)%val ) ) ) THEN - IF( lk_mpp .AND. ln_ctl ) THEN - zzz%sbits = emulator_variable_precisions(3356) - CALL apply_truncation(zzz) -@@ -132,10 +132,10 @@ - zzz%sbits = emulator_variable_precisions(3356) - CALL apply_truncation(zzz) - ELSE -- ih(:) = MAXLOC( ABS( sshn(:,:) ) ) + (/ nimpp - 1, njmpp - 1 /) -- iu(:) = MAXLOC( ABS( un (:,:,:) ) ) + (/ nimpp - 1, njmpp - 1, 0 /) -- is1(:) = MINLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /) -- is2(:) = MAXLOC( tsn(:,:,:,jp_sal), mask = tmask(:,:,:) == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /) -+ ih(:) = MAXLOC( ABS( sshn(:,:)%val ) ) + (/ nimpp - 1, njmpp - 1 /) -+ iu(:) = MAXLOC( ABS( un (:,:,:)%val ) ) + (/ nimpp - 1, njmpp - 1, 0 /) -+ is1(:) = MINLOC( tsn(:,:,:,jp_sal)%val, mask = tmask(:,:,:)%val == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /) -+ is2(:) = MAXLOC( tsn(:,:,:,jp_sal)%val, mask = tmask(:,:,:)%val == 1._wp ) + (/ nimpp - 1, njmpp - 1, 0 /) - ENDIF - WRITE(ctmp1,*) ' stp_ctl: |ssh| > 20 m or |U| > 10 m/s or S <= 0 or S >= 100 or NaN encounter in the tests' - WRITE(ctmp2,9100) kt,real( zmax(1) ), ih(1) , ih(2) -- GitLab