Changeset 10168


Ignore:
Timestamp:
2018-10-03T16:38:42+02:00 (21 months ago)
Author:
dford
Message:

Remove key_foam_medusa, following GMED ticket 379.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r9306 r10168  
    888888      USE par_hadocc 
    889889      USE had_bgc_const, ONLY: c2n_p 
    890 #elif defined key_medusa && defined key_foam_medusa 
     890#elif defined key_medusa 
    891891      USE trc, ONLY :  &           ! MEDUSA variables 
    892892         & trn 
     
    985985               ! Chlorophyll from HadOCC 
    986986               zprofvar(:,:,:,1) = HADOCC_CHL(:,:,:) 
    987 #elif defined key_medusa && defined key_foam_medusa 
     987#elif defined key_medusa 
    988988               ! Add non-diatom and diatom chlorophyll from MEDUSA 
    989989               zprofvar(:,:,:,1) = trn(:,:,:,jpchn) + trn(:,:,:,jpchd) 
     
    10231023               ! Chlorophyll from HadOCC 
    10241024               zprofvar(:,:,:,1) = HADOCC_CHL(:,:,:) 
    1025 #elif defined key_medusa && defined key_foam_medusa 
     1025#elif defined key_medusa 
    10261026               ! Add non-diatom and diatom chlorophyll from MEDUSA 
    10271027               zprofvar(:,:,:,1) = trn(:,:,:,jpchn) + trn(:,:,:,jpchd) 
     
    10391039               ! Dissolved inorganic nitrogen from HadOCC 
    10401040               zprofvar(:,:,:,1) = trn(:,:,:,jp_had_nut) 
    1041 #elif defined key_medusa && defined key_foam_medusa 
     1041#elif defined key_medusa 
    10421042               ! Dissolved inorganic nitrogen from MEDUSA 
    10431043               zprofvar(:,:,:,1) = trn(:,:,:,jpdin) 
     
    10541054               CALL ctl_stop( ' Trying to run psi4 observation operator', & 
    10551055                  &           ' but HadOCC does not simulate silicate' ) 
    1056 #elif defined key_medusa && defined key_foam_medusa 
     1056#elif defined key_medusa 
    10571057               ! Silicate from MEDUSA 
    10581058               zprofvar(:,:,:,1) = trn(:,:,:,jpsil) 
     
    10691069               CALL ctl_stop( ' Trying to run ppo4 observation operator', & 
    10701070                  &           ' but HadOCC does not simulate phosphate' ) 
    1071 #elif defined key_medusa && defined key_foam_medusa 
     1071#elif defined key_medusa 
    10721072               CALL ctl_stop( ' Trying to run ppo4 observation operator', & 
    10731073                  &           ' but MEDUSA does not simulate phosphate' ) 
     
    10841084               ! Dissolved inorganic carbon from HadOCC 
    10851085               zprofvar(:,:,:,1) = trn(:,:,:,jp_had_dic) 
    1086 #elif defined key_medusa && defined key_foam_medusa 
     1086#elif defined key_medusa 
    10871087               ! Dissolved inorganic carbon from MEDUSA 
    10881088               zprofvar(:,:,:,1) = trn(:,:,:,jpdic) 
     
    10991099               ! Alkalinity from HadOCC 
    11001100               zprofvar(:,:,:,1) = trn(:,:,:,jp_had_alk) 
    1101 #elif defined key_medusa && defined key_foam_medusa 
     1101#elif defined key_medusa 
    11021102               ! Alkalinity from MEDUSA 
    11031103               zprofvar(:,:,:,1) = trn(:,:,:,jpalk) 
     
    11141114               CALL ctl_stop( ' Trying to run pph observation operator', & 
    11151115                  &           ' but HadOCC has no pH diagnostic defined' ) 
    1116 #elif defined key_medusa && defined key_foam_medusa 
     1116#elif defined key_medusa && defined key_roam 
    11171117               ! pH from MEDUSA 
    11181118               zprofvar(:,:,:,1) = f3_pH(:,:,:) 
     
    11291129               CALL ctl_stop( ' Trying to run po2 observation operator', & 
    11301130                  &           ' but HadOCC does not simulate oxygen' ) 
    1131 #elif defined key_medusa && defined key_foam_medusa 
     1131#elif defined key_medusa 
    11321132               ! Oxygen from MEDUSA 
    11331133               zprofvar(:,:,:,1) = trn(:,:,:,jpoxy) 
     
    12101210               ! Surface chlorophyll from HadOCC 
    12111211               zsurfvar(:,:) = HADOCC_CHL(:,:,1) 
    1212 #elif defined key_medusa && defined key_foam_medusa 
     1212#elif defined key_medusa 
    12131213               ! Add non-diatom and diatom surface chlorophyll from MEDUSA 
    12141214               zsurfvar(:,:) = trn(:,:,1,jpchn) + trn(:,:,1,jpchd) 
     
    12271227               CALL ctl_stop( ' Trying to run slchldia observation operator', & 
    12281228                  &           ' but HadOCC does not explicitly simulate diatoms' ) 
    1229 #elif defined key_medusa && defined key_foam_medusa 
     1229#elif defined key_medusa 
    12301230               ! Diatom surface chlorophyll from MEDUSA 
    12311231               zsurfvar(:,:) = trn(:,:,1,jpchd) 
     
    12431243               CALL ctl_stop( ' Trying to run slchlnon observation operator', & 
    12441244                  &           ' but HadOCC does not explicitly simulate non-diatoms' ) 
    1245 #elif defined key_medusa && defined key_foam_medusa 
     1245#elif defined key_medusa 
    12461246               ! Non-diatom surface chlorophyll from MEDUSA 
    12471247               zsurfvar(:,:) = trn(:,:,1,jpchn) 
     
    12601260               CALL ctl_stop( ' Trying to run slchldin observation operator', & 
    12611261                  &           ' but HadOCC does not explicitly simulate dinoflagellates' ) 
    1262 #elif defined key_medusa && defined key_foam_medusa 
     1262#elif defined key_medusa 
    12631263               CALL ctl_stop( ' Trying to run slchldin observation operator', & 
    12641264                  &           ' but MEDUSA does not explicitly simulate dinoflagellates' ) 
     
    12761276               CALL ctl_stop( ' Trying to run slchlmic observation operator', & 
    12771277                  &           ' but HadOCC does not explicitly simulate microphytoplankton' ) 
    1278 #elif defined key_medusa && defined key_foam_medusa 
     1278#elif defined key_medusa 
    12791279               CALL ctl_stop( ' Trying to run slchlmic observation operator', & 
    12801280                  &           ' but MEDUSA does not explicitly simulate microphytoplankton' ) 
     
    12921292               CALL ctl_stop( ' Trying to run slchlnan observation operator', & 
    12931293                  &           ' but HadOCC does not explicitly simulate nanophytoplankton' ) 
    1294 #elif defined key_medusa && defined key_foam_medusa 
     1294#elif defined key_medusa 
    12951295               CALL ctl_stop( ' Trying to run slchlnan observation operator', & 
    12961296                  &           ' but MEDUSA does not explicitly simulate nanophytoplankton' ) 
     
    13081308               CALL ctl_stop( ' Trying to run slchlpic observation operator', & 
    13091309                  &           ' but HadOCC does not explicitly simulate picophytoplankton' ) 
    1310 #elif defined key_medusa && defined key_foam_medusa 
     1310#elif defined key_medusa 
    13111311               CALL ctl_stop( ' Trying to run slchlpic observation operator', & 
    13121312                  &           ' but MEDUSA does not explicitly simulate picophytoplankton' ) 
     
    13241324               ! Surface chlorophyll from HadOCC 
    13251325               zsurfvar(:,:) = HADOCC_CHL(:,:,1) 
    1326 #elif defined key_medusa && defined key_foam_medusa 
     1326#elif defined key_medusa 
    13271327               ! Add non-diatom and diatom surface chlorophyll from MEDUSA 
    13281328               zsurfvar(:,:) = trn(:,:,1,jpchn) + trn(:,:,1,jpchd) 
     
    13401340               ! Surface phytoplankton nitrogen from HadOCC multiplied by C:N ratio 
    13411341               zsurfvar(:,:) = trn(:,:,1,jp_had_phy) * c2n_p 
    1342 #elif defined key_medusa && defined key_foam_medusa 
     1342#elif defined key_medusa 
    13431343               ! Add non-diatom and diatom surface phytoplankton nitrogen from MEDUSA 
    13441344               ! multiplied by C:N ratio for each 
     
    13581358               CALL ctl_stop( ' Trying to run slphydia observation operator', & 
    13591359                  &           ' but HadOCC does not explicitly simulate diatoms' ) 
    1360 #elif defined key_medusa && defined key_foam_medusa 
     1360#elif defined key_medusa 
    13611361               ! Diatom surface phytoplankton nitrogen from MEDUSA multiplied by C:N ratio 
    13621362               zsurfvar(:,:) = trn(:,:,1,jpphd) * xthetapd 
     
    13741374               CALL ctl_stop( ' Trying to run slphynon observation operator', & 
    13751375                  &           ' but HadOCC does not explicitly simulate non-diatoms' ) 
    1376 #elif defined key_medusa && defined key_foam_medusa 
     1376#elif defined key_medusa 
    13771377               ! Non-diatom surface phytoplankton nitrogen from MEDUSA multiplied by C:N ratio 
    13781378               zsurfvar(:,:) = trn(:,:,1,jpphn) * xthetapn 
     
    14081408                     &           ' as HADOCC_FCO2(:,:) == HADOCC_FILL_FLT' ) 
    14091409               ENDIF 
    1410 #elif defined key_medusa && defined key_foam_medusa && defined key_roam 
     1410#elif defined key_medusa && defined key_roam 
    14111411               zsurfvar(:,:) = f2_fco2w(:,:) 
    14121412#elif defined key_fabm 
     
    14481448                     &           ' as HADOCC_PCO2(:,:) == HADOCC_FILL_FLT' ) 
    14491449               ENDIF 
    1450 #elif defined key_medusa && defined key_foam_medusa && defined key_roam 
     1450#elif defined key_medusa && defined key_roam 
    14511451               zsurfvar(:,:) = f2_pco2w(:,:) 
    14521452#elif defined key_fabm 
Note: See TracChangeset for help on using the changeset viewer.