Changeset 2567 for trunk/LMDZ.MARS/util/aeroptical.F90

Timestamp:

Oct 5, 2021, 8:34:09 AM (3 years ago)

Author:

emillour

Message:

Mars GCM utilities:
Minor fixes to run with picky gfortran 10.3.0 which requires one element arrays
(rather than scalars) when calling NetCDF routines, andf that stop statements
should not be followed by strings. While at it replaced tabs with spaces.
EM

File:

• trunk/LMDZ.MARS/util/aeroptical.F90 (modified) (21 diffs)

trunk/LMDZ.MARS/util/aeroptical.F90

@@ -1304 +1304 @@
   hybrid=.true.
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed reading aps"
+    write(*,*) "init2 Error: Failed reading aps"
+    stop
   endif
 
@@ -1316 +1317 @@
   ierr=nf90_inq_varid(gcmfid,"bps",tmpvarid)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to get bps ID."
+    write(*,*) "init2 Error: Failed to get bps ID."
+    stop
   endif
   ierr=NF90_GET_VAR(gcmfid,tmpvarid,bps)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed reading bps"
+    write(*,*) "init2 Error: Failed reading bps"
+    stop
   endif
 endif
@@ -1338 +1341 @@
     apbp=.true.
     if (ierr.ne.nf90_noerr) then
-      stop "Error: Failed reading ap"
+      write(*,*) "Error: Failed reading ap"
+      stop
     endif
   endif
@@ -1357 +1361 @@
     apbp=.true.
     if (ierr.ne.nf90_noerr) then
-      stop "Error: Failed reading bp"
+      write(*,*) "Error: Failed reading bp"
+      stop
     endif
   endif
@@ -1372 +1377 @@
   ierr=NF90_GET_VAR(gcmfid,tmpvarid,sigma)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed reading sigma"
+    write(*,*) "init2 Error: Failed reading sigma"
+    stop
   endif
 endif ! of if (.not.hybrid)
@@ -1389 +1395 @@
   ierr=NF90_GET_VAR(gcmfid,tmpvarid,aire)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed reading aire"
+    write(*,*) "init2 Error: Failed reading aire"
+    stop
   endif
   area = .true.
@@ -1407 +1414 @@
   ierr=NF90_GET_VAR(gcmfid,tmpvarid,phisinit)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed reading phisinit"
+    write(*,*) "init2 Error: Failed reading phisinit"
+    stop
   endif
   phis = .true.
@@ -1426 +1434 @@
   ierr=NF90_DEF_VAR(outfid,"aps",nf90_float,(/layerdimout/),tmpvarid)
   if (ierr.ne.nf90_noerr) then
-     stop "init2 Error: Failed to define the variable aps"
+     write(*,*) "init2 Error: Failed to define the variable aps"
+     stop
   endif
   ! Write the attributes
@@ -1437 +1446 @@
   ierr=NF90_PUT_VAR(outfid,tmpvarid,aps)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to write aps"
+    write(*,*) "init2 Error: Failed to write aps"
+    stop
   endif
 
@@ -1446 +1456 @@
   ierr=NF90_DEF_VAR(outfid,"bps",nf90_float,(/layerdimout/),tmpvarid)
   if (ierr.ne.nf90_noerr) then
-     stop "init2 Error: Failed to define the variable bps"
+     write(*,*) "init2 Error: Failed to define the variable bps"
+     stop
   endif
   ! Write the attributes
@@ -1457 +1468 @@
   ierr=NF90_PUT_VAR(outfid,tmpvarid,bps)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to write bps"
+    write(*,*) "init2 Error: Failed to write bps"
+    stop
   endif
 
@@ -1468 +1480 @@
     ierr=NF90_DEF_VAR(outfid,"ap",nf90_float,(/interlayerdimout/),tmpvarid)
     if (ierr.ne.nf90_noerr) then
-       stop "init2 Error: Failed to define the variable ap"
+       write(*,*) "init2 Error: Failed to define the variable ap"
+       stop
     endif
     ! Write the attributes
@@ -1479 +1492 @@
     ierr=NF90_PUT_VAR(outfid,tmpvarid,ap)
     if (ierr.ne.nf90_noerr) then
-      stop "Error: Failed to write ap"
+      write(*,*) "Error: Failed to write ap"
+      stop
     endif
 
@@ -1489 +1503 @@
     ierr=NF90_DEF_VAR(outfid,"bp",nf90_float,(/interlayerdimout/),tmpvarid)
     if (ierr.ne.nf90_noerr) then
-       stop "init2 Error: Failed to define the variable bp"
+       write(*,*) "init2 Error: Failed to define the variable bp"
+       stop
     endif
     ! Write the attributes
@@ -1500 +1515 @@
     ierr=NF90_PUT_VAR(outfid,tmpvarid,bp)
     if (ierr.ne.nf90_noerr) then
-      stop "Error: Failed to write bp"
+      write(*,*) "Error: Failed to write bp"
+      stop
     endif
   endif ! of if (apbp)
@@ -1511 +1527 @@
   ierr=NF90_DEF_VAR(outfid,"sigma",nf90_float,(/layerdimout/),tmpvarid)
   if (ierr.ne.nf90_noerr) then
-     stop "init2 Error: Failed to define the variable sigma"
+     write(*,*) "init2 Error: Failed to define the variable sigma"
+     stop
   endif
   ! Write the attributes
@@ -1522 +1539 @@
   ierr=NF90_PUT_VAR(outfid,tmpvarid,sigma)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to write sigma"
+    write(*,*) "init2 Error: Failed to write sigma"
+    stop
   endif
 endif ! of if (hybrid)
@@ -1537 +1555 @@
   ierr=NF90_DEF_VAR(outfid,"aire",nf90_float,(/londimout,latdimout/),tmpvarid)
   if (ierr.ne.nf90_noerr) then
-     stop "init2 Error: Failed to define the variable aire"
+     write(*,*) "init2 Error: Failed to define the variable aire"
+     stop
   endif
   ! Write the attributes
@@ -1548 +1567 @@
   ierr=NF90_PUT_VAR(outfid,tmpvarid,aire)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to write aire"
+    write(*,*) "init2 Error: Failed to write aire"
+    stop
   endif
 endif ! of if (area)
@@ -1559 +1579 @@
   ierr=NF90_DEF_VAR(outfid,"phisinit",nf90_float,(/londimout,latdimout/),tmpvarid)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to define the variable phisinit"
+    write(*,*) "init2 Error: Failed to define the variable phisinit"
+    stop
   endif
   ! Write the attributes
@@ -1570 +1591 @@
   ierr=NF90_PUT_VAR(outfid,tmpvarid,phisinit)
   if (ierr.ne.nf90_noerr) then
-    stop "init2 Error: Failed to write phisinit"
+    write(*,*) "init2 Error: Failed to write phisinit"
+    stop
   endif