Merge pull request #26 from noaa-oar-arl/develop

Updated NACCv2.0.0 for setgriddefs bug.
noaa-oar-arl · Jul 10, 2022 · 7a8df4c · 7a8df4c
2 parents 3c3ca9c + b986ef8
commit 7a8df4c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/parallel/scripts/orc-gnu-ompi-run-nacc-fv3_lam_slurm.sh b/parallel/scripts/orc-gnu-ompi-run-nacc-fv3_lam_slurm.sh
@@ -5,7 +5,7 @@
 #SBATCH --output=nacc-test-%j.out     # write stdout/stderr   to named file
 #SBATCH --error=nacc-test-%j.err
 #SBATCH --time=0-00:10:00             # Run for max of 00 hrs, 10 mins, 00 secs
-#SBATCH --nodes=12                    # Request N nodes
+#SBATCH --nodes=2                    # Request N nodes
 #SBATCH --ntasks=2                    # Request n tasks
 ##SBATCH --cpus-per-task=12            # Request n cores per node
 #SBATCH --mem-per-cpu=8GB             # Request nGB RAM per core
@@ -20,15 +20,15 @@ module load ioapi/3.2-spack
 
 #Set number of nacc times  = processors, and # of nodes
 NTIMES=2
-export NODES=12
+export NODES=2
 
 APPL=aqm.srw-lam
 InMetDir=/groups/ESS/pcampbe8/srw-lam-test
 InGeoDir=/groups/ESS/pcampbe8/nacc_geofiles
 InVIIRSDir_GVF=./
 InVIIRSDir_LAI=./
 OutDir=/groups/ESS/pcampbe8/srw-lam-test/nacc_output_parallel
-ProgDir=/groups/ESS/pcampbe8/NACC-srw_lam/parallel/src
+ProgDir=/groups/ESS/pcampbe8/NACC/parallel/src
 
 
 if [ ! -s $InMetDir ]; then

diff --git a/parallel/src/setgriddefs.f90 b/parallel/src/setgriddefs.f90
@@ -563,7 +563,7 @@ SUBROUTINE setgriddefs
 ! Check user-defined MCIP output time info against input meteorology.
 !-------------------------------------------------------------------------------
 
-  IF ( ABS( intvl - NINT(met_tapfrq) ) > ttol_min .and. (met_model.ne.3.or.met_model.ne.4) ) THEN
+  IF ( ABS( intvl - NINT(met_tapfrq) ) > ttol_min .and. (met_model.ne.3.and.met_model.ne.4) ) THEN
     WRITE (*,f9300) TRIM(pname), intvl, met_tapfrq
     CALL graceful_stop (pname)
   ENDIF

diff --git a/serial/src/setgriddefs.f90 b/serial/src/setgriddefs.f90
@@ -563,7 +563,7 @@ SUBROUTINE setgriddefs
 ! Check user-defined MCIP output time info against input meteorology.
 !-------------------------------------------------------------------------------
 
-  IF ( ABS( intvl - NINT(met_tapfrq) ) > ttol_min .and. (met_model.ne.3.or.met_model.ne.4) ) THEN
+  IF ( ABS( intvl - NINT(met_tapfrq) ) > ttol_min .and. (met_model.ne.3.and.met_model.ne.4) ) THEN
     WRITE (*,f9300) TRIM(pname), intvl, met_tapfrq
     CALL graceful_stop (pname)
   ENDIF