Merge branch 'fb_stvp' of github.com:CarstenHansen/WW3 into fb_xsmf

CarstenHansen · Jul 23, 2024 · faaaaf7 · faaaaf7
2 parents 9fa62cb + e15ad18
commit faaaaf7
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 664 deletions.
diff --git a/.github/workflows/regtest_gnu.yml b/.github/workflows/regtest_gnu.yml
@@ -91,7 +91,7 @@ jobs:
             spack
             ~/.spack
             work_oasis3-mct
-          key: spack2-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack_gnu.yaml') }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack_gnu.yaml') }}
 
       - name: build-ww3
         run: |
@@ -102,10 +102,10 @@ jobs:
           export CC=mpicc
           export FC=mpif90
           export OASISDIR=${GITHUB_WORKSPACE}/work_oasis3-mct
-#          mkdir build && cd build
+          # mkdir build && cd build
           export LD_LIBRARY_PATH="/home/runner/work/WW3/WW3/spack/var/spack/environments/ww3-gnu/.spack-env/view/:$LD_LIBRARY_PATH"
-#          cmake -DSWITCH=${GITHUB_WORKSPACE}/ww3/regtests/unittests/data/switch.io -DCMAKE_BUILD_TYPE=Debug ..
-#          make -j2 VERBOSE=1
+          # cmake -DSWITCH=${GITHUB_WORKSPACE}/ww3/regtests/unittests/data/switch.io -DCMAKE_BUILD_TYPE=Debug ..
+          # make -j2 VERBOSE=1
           cd ${GITHUB_WORKSPACE}/ww3
           ls -l
           ${GITHUB_WORKSPACE}/ww3/model/bin/ww3_from_ftp.sh -k
@@ -116,18 +116,15 @@ jobs:
           cd work_PR1_MPI
           pwd
           ls -l
-          ncdump -h out_pnt.ww3.nc > ncdump_out.txt
-          cat ncdump_out.txt
-          pwd
-          cat ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt
-          cmp ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt ncdump_out.txt          
-        
+          # ncdump -h out_pnt.ww3.nc > ncdump_out.txt
+          # cat ncdump_out.txt
+          # pwd
+          # cat ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt
+          # cmp ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt ncdump_out.txt
+
       - name: cache-data
         id: cache-data
         uses: actions/cache@v3
         with:
           path: ww3/ww3_from_ftp.v7.14.1.tar.gz
           key: ww3_from_ftp.v7.14.1
-
-
-
diff --git a/model/src/w3bullmd.F90 b/model/src/w3bullmd.F90
@@ -268,8 +268,8 @@ SUBROUTINE W3BULL                                                &
     !
     CSVBLINE      = BLANK2
     !
+    IPG1 = 0
     IF (IOUT .EQ. 1) THEN
-      IPG1 = 0
       DO IP=1, NPTAB
         HST(IP,1) = -99.9
         TPT(IP,1) = -99.9
@@ -286,10 +286,12 @@ SUBROUTINE W3BULL                                                &
     !
     HSTOT  = XPART(1,0)
     TP     = XPART(2,0)
-    HSP = XPART(1,1:NPART)
-    TPP = XPART(2,1:NPART)
-    WNP = TPI / XPART(3,1:NPART)
-    DMP = MOD( XPART(4,1:NPART) + 180., 360.)
+    DO IP=1, NPART
+      HSP(IP) = XPART(1,IP)
+      TPP(IP) = XPART(2,IP)
+      WNP(IP) = TPI / XPART(3,IP)
+      DMP(IP) = MOD( XPART(4,IP) + 180., 360.)
+    ENDDO
 
     NZERO = 0
     NZERO = COUNT( HSP <= BHSMIN .AND. HSP /= 0.  )